Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-02-13 19:04:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-46263: Don't use MULTIARCH on FreeBSD (GH-30410)

Browse source 
(cherry picked from commit cae55542d2)

Co-authored-by: Christian Heimes <christian@python.org>
This commit is contained in:
Miss Islington (bot) 2022-01-05 02:17:39 -08:00 • committed by GitHub
parent 289a32baf7
commit 7e951f356e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Build/2022-01-05-02-58-10.bpo-46263.xiv8NU.rst Normal file
View file

@ -0,0 +1 @@
``configure`` no longer sets ``MULTIARCH`` on FreeBSD platforms.

17
configure vendored
View file

@ -5384,10 +5384,20 @@ $as_echo "none" >&6; }
fi
rm -f conftest.c conftest.out
if test x$PLATFORM_TRIPLET != xdarwin; then
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch" >&5
$as_echo_n "checking for multiarch... " >&6; }
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$MULTIARCH; then
@ -5397,6 +5407,7 @@ elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
MULTIARCH=$PLATFORM_TRIPLET
fi
if test x$MULTIARCH != x; then
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
fi

13
configure.ac
View file

@ -872,10 +872,14 @@ else
fi
rm -f conftest.c conftest.out
if test x$PLATFORM_TRIPLET != xdarwin; then
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
fi
AC_SUBST(MULTIARCH)
AC_MSG_CHECKING([for multiarch])
AS_CASE([$ac_sys_system],
[Darwin*], [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$MULTIARCH; then
@ -885,6 +889,7 @@ elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
MULTIARCH=$PLATFORM_TRIPLET
fi
AC_SUBST(PLATFORM_TRIPLET)
if test x$MULTIARCH != x; then
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
fi