Skip to content

Commit f77c386

Browse files
committed
gh-155813: Stop overwriting LIBFFI_CFLAGS and LIBFFI_LIBS on macOS
1 parent eb08902 commit f77c386

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
On macOS, :option:`LIBFFI_CFLAGS` and :option:`LIBFFI_LIBS` are no longer
2+
ignored when the SDK provides ``libffi``, so :mod:`ctypes` can again be built
3+
against a different ``libffi``. Patch by Advit Arora.

configure

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4375,8 +4375,8 @@ AS_VAR_IF([ac_sys_system], [Darwin], [
43754375
AC_CHECK_LIB([ffi], [ffi_call], [
43764376
dnl use ffi from SDK root
43774377
have_libffi=yes
4378-
LIBFFI_CFLAGS="-I${SDKROOT}/usr/include/ffi -DUSING_APPLE_OS_LIBFFI=1"
4379-
LIBFFI_LIBS="-lffi"
4378+
LIBFFI_CFLAGS=${LIBFFI_CFLAGS-"-I${SDKROOT}/usr/include/ffi -DUSING_APPLE_OS_LIBFFI=1"}
4379+
LIBFFI_LIBS=${LIBFFI_LIBS-"-lffi"}
43804380
])
43814381
])
43824382
])

0 commit comments

Comments
 (0)