mirror of
https://github.com/python/cpython
synced 2024-09-15 23:46:26 +00:00
bpo-46263: Don't use MULTIARCH on FreeBSD (#30410)
This commit is contained in:
parent
91bc6f9615
commit
cae55542d2
|
@ -0,0 +1 @@
|
||||||
|
``configure`` no longer sets ``MULTIARCH`` on FreeBSD platforms.
|
17
configure
vendored
17
configure
vendored
|
@ -6091,10 +6091,20 @@ $as_echo "none" >&6; }
|
||||||
fi
|
fi
|
||||||
rm -f conftest.c conftest.out
|
rm -f conftest.c conftest.out
|
||||||
|
|
||||||
if test x$PLATFORM_TRIPLET != xdarwin; then
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch" >&5
|
||||||
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
|
$as_echo_n "checking for multiarch... " >&6; }
|
||||||
fi
|
case $ac_sys_system in #(
|
||||||
|
Darwin*) :
|
||||||
|
MULTIARCH="" ;; #(
|
||||||
|
FreeBSD*) :
|
||||||
|
MULTIARCH="" ;; #(
|
||||||
|
*) :
|
||||||
|
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MULTIARCH" >&5
|
||||||
|
$as_echo "$MULTIARCH" >&6; }
|
||||||
|
|
||||||
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
|
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
|
||||||
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
|
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
|
||||||
|
@ -6104,6 +6114,7 @@ elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
|
||||||
MULTIARCH=$PLATFORM_TRIPLET
|
MULTIARCH=$PLATFORM_TRIPLET
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if test x$MULTIARCH != x; then
|
if test x$MULTIARCH != x; then
|
||||||
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
|
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
|
||||||
fi
|
fi
|
||||||
|
|
13
configure.ac
13
configure.ac
|
@ -987,10 +987,14 @@ else
|
||||||
fi
|
fi
|
||||||
rm -f conftest.c conftest.out
|
rm -f conftest.c conftest.out
|
||||||
|
|
||||||
if test x$PLATFORM_TRIPLET != xdarwin; then
|
AC_MSG_CHECKING([for multiarch])
|
||||||
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
|
AS_CASE([$ac_sys_system],
|
||||||
fi
|
[Darwin*], [MULTIARCH=""],
|
||||||
AC_SUBST(MULTIARCH)
|
[FreeBSD*], [MULTIARCH=""],
|
||||||
|
[MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
|
||||||
|
)
|
||||||
|
AC_SUBST([MULTIARCH])
|
||||||
|
AC_MSG_RESULT([$MULTIARCH])
|
||||||
|
|
||||||
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
|
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
|
||||||
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
|
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
|
||||||
|
@ -1000,6 +1004,7 @@ elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
|
||||||
MULTIARCH=$PLATFORM_TRIPLET
|
MULTIARCH=$PLATFORM_TRIPLET
|
||||||
fi
|
fi
|
||||||
AC_SUBST(PLATFORM_TRIPLET)
|
AC_SUBST(PLATFORM_TRIPLET)
|
||||||
|
|
||||||
if test x$MULTIARCH != x; then
|
if test x$MULTIARCH != x; then
|
||||||
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
|
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue