summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2022-01-05 10:20:09 (GMT)
committerGitHub <noreply@github.com>2022-01-05 10:20:09 (GMT)
commit64199e9235275a795097ee0c53b2c560e21c70d0 (patch)
treed63872655314a6b2871b4181f7f83e1a0f8d14f6 /configure
parentf902d88be3aa42e03119b15469493e5cc816b784 (diff)
downloadcpython-64199e9235275a795097ee0c53b2c560e21c70d0.zip
cpython-64199e9235275a795097ee0c53b2c560e21c70d0.tar.gz
cpython-64199e9235275a795097ee0c53b2c560e21c70d0.tar.bz2
bpo-46263: Don't use MULTIARCH on FreeBSD (GH-30410)
(cherry picked from commit cae55542d23e606dde9819d5dadd7430085fcc77) Co-authored-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure17
1 files changed, 14 insertions, 3 deletions
diff --git a/configure b/configure
index 1b1caf8..d078887 100755
--- a/configure
+++ b/configure
@@ -5366,10 +5366,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
@@ -5379,6 +5389,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