Skip to content

Commit cae5554

Browse files
authored
bpo-46263: Don't use MULTIARCH on FreeBSD (#30410)
1 parent 91bc6f9 commit cae5554

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed
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
@@ -6091,10 +6091,20 @@ $as_echo "none" >&6; }
60916091
fi
60926092
rm -f conftest.c conftest.out
60936093

6094-
if test x$PLATFORM_TRIPLET != xdarwin; then
6095-
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
6096-
fi
6094+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch" >&5
6095+
$as_echo_n "checking for multiarch... " >&6; }
6096+
case $ac_sys_system in #(
6097+
Darwin*) :
6098+
MULTIARCH="" ;; #(
6099+
FreeBSD*) :
6100+
MULTIARCH="" ;; #(
6101+
*) :
6102+
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
6103+
;;
6104+
esac
60976105

6106+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MULTIARCH" >&5
6107+
$as_echo "$MULTIARCH" >&6; }
60986108

60996109
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
61006110
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
@@ -6104,6 +6114,7 @@ elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
61046114
MULTIARCH=$PLATFORM_TRIPLET
61056115
fi
61066116

6117+
61076118
if test x$MULTIARCH != x; then
61086119
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
61096120
fi

configure.ac

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -987,10 +987,14 @@ else
987987
fi
988988
rm -f conftest.c conftest.out
989989

990-
if test x$PLATFORM_TRIPLET != xdarwin; then
991-
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
992-
fi
993-
AC_SUBST(MULTIARCH)
990+
AC_MSG_CHECKING([for multiarch])
991+
AS_CASE([$ac_sys_system],
992+
[Darwin*], [MULTIARCH=""],
993+
[FreeBSD*], [MULTIARCH=""],
994+
[MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
995+
)
996+
AC_SUBST([MULTIARCH])
997+
AC_MSG_RESULT([$MULTIARCH])
994998

995999
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
9961000
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
@@ -1000,6 +1004,7 @@ elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
10001004
MULTIARCH=$PLATFORM_TRIPLET
10011005
fi
10021006
AC_SUBST(PLATFORM_TRIPLET)
1007+
10031008
if test x$MULTIARCH != x; then
10041009
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
10051010
fi

0 commit comments

Comments
 (0)