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

Commit 7e951f3

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 289a32b commit 7e951f3

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
@@ -5384,10 +5384,20 @@ $as_echo "none" >&6; }
53845384
fi
53855385
rm -f conftest.c conftest.out
53865386

5387-
if test x$PLATFORM_TRIPLET != xdarwin; then
5388-
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
5389-
fi
5387+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch" >&5
5388+
$as_echo_n "checking for multiarch... " >&6; }
5389+
case $ac_sys_system in #(
5390+
Darwin*) :
5391+
MULTIARCH="" ;; #(
5392+
FreeBSD*) :
5393+
MULTIARCH="" ;; #(
5394+
*) :
5395+
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
5396+
;;
5397+
esac
53905398

5399+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MULTIARCH" >&5
5400+
$as_echo "$MULTIARCH" >&6; }
53915401

53925402
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
53935403
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
@@ -5397,6 +5407,7 @@ elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
53975407
MULTIARCH=$PLATFORM_TRIPLET
53985408
fi
53995409

5410+
54005411
if test x$MULTIARCH != x; then
54015412
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
54025413
fi

‎configure.ac

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -872,10 +872,14 @@ else
872872
fi
873873
rm -f conftest.c conftest.out
874874

875-
if test x$PLATFORM_TRIPLET != xdarwin; then
876-
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
877-
fi
878-
AC_SUBST(MULTIARCH)
875+
AC_MSG_CHECKING([for multiarch])
876+
AS_CASE([$ac_sys_system],
877+
[Darwin*], [MULTIARCH=""],
878+
[FreeBSD*], [MULTIARCH=""],
879+
[MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
880+
)
881+
AC_SUBST([MULTIARCH])
882+
AC_MSG_RESULT([$MULTIARCH])
879883

880884
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
881885
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
@@ -885,6 +889,7 @@ elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
885889
MULTIARCH=$PLATFORM_TRIPLET
886890
fi
887891
AC_SUBST(PLATFORM_TRIPLET)
892+
888893
if test x$MULTIARCH != x; then
889894
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
890895
fi

0 commit comments

Comments
 (0)
0