8000 bpo-46263: Don't use MULTIARCH on FreeBSD (GH-30410) · python/cpython@64199e9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 64199e9

Browse files
miss-islingtontiran
miss-islington
and
tiran
authored
bpo-46263: Don't use MULTIARCH on FreeBSD (GH-30410)
(cherry picked from commit cae5554) Co-authored-by: Christian Heimes <christian@python.org>
1 parent f902d88 commit 64199e9

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed

‎Misc/NEWS.d/next/Build/2022-01-05-02-58-10.bpo-46263.xiv8NU.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
``configure`` no longer sets ``MULTIARCH`` on FreeBSD platforms.

‎configure

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5366,10 +5366,20 @@ $as_echo "none" >&6; }
53665366
fi
53675367
rm -f conftest.c conftest.out
53685368

5369-
if test x$PLATFORM_TRIPLET != xdarwin; then
5370-
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
5371-
fi
5369+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch" >&5
5370+
$as_echo_n "checking for multiarch... " >&6; }
5371+
case $ac_sys_system in #(
5372+
Darwin*) :
5373+
MULTIARCH="" ;; #(
5374+
FreeBSD*) :
5375+
MULTIARCH="" ;; #(
5376+
*) :
5377+
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
5378+
;;
5379+
esac
53725380

5381+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MULTIARCH" >&5
5382+
$as_echo "$MULTIARCH" >&6; }
53735383

53745384
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
53755385
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
@@ -5379,6 +5389,7 @@ elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
53795389
MULTIARCH=$PLATFORM_TRIPLET
53805390
fi
53815391

5392+
53825393
if test x$MULTIARCH != x; then
53835394
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
53845395
fi

‎configure.ac

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -882,10 +882,14 @@ else
882882
fi
883883
rm -f conftest.c conftest.out
884884

885-
if test x$PLATFORM_TRIPLET != xdarwin; then
886-
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
887-
fi
888-
AC_SUBST(MULTIARCH)
885+
AC_MSG_CHECKING([for multiarch])
886+
AS_CASE([$ac_sys_system],
887+
[Darwin*], [MULTIARCH=""],
888+
[FreeBSD*], [MULTIARCH=""],
889+
[MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
890+
)
891+
AC_SUBST([MULTIARCH])
892+
AC_MSG_RESULT([$MULTIARCH])
889893

890894
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
891895
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
@@ -895,6 +899,7 @@ elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
895899
MULTIARCH=$PLATFORM_TRIPLET
896900
fi
897901
AC_SUBST(PLATFORM_TRIPLET)
902+
898903
if test x$MULTIARCH != x; then
899904
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
900905
fi

0 commit comments

Comments
 (0)
0