File tree 3 files changed +24
-7
lines changed
3 files changed +24
-7
lines changed Original file line number Diff line number Diff line change
1
+ ``configure `` no longer sets ``MULTIARCH `` on FreeBSD platforms.
Original file line number Diff line number Diff line change @@ -6091,10 +6091,20 @@ $as_echo "none" >&6; }
6091
6091
fi
6092
6092
rm -f conftest.c conftest.out
6093
6093
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
6097
6105
6106
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MULTIARCH" >&5
6107
+ $as_echo "$MULTIARCH" >&6; }
6098
6108
6099
6109
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
6100
6110
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
@@ -6104,6 +6114,7 @@ elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
6104
6114
MULTIARCH=$PLATFORM_TRIPLET
6105
6115
fi
6106
6116
6117
+
6107
6118
if test x$MULTIARCH != x; then
6108
6119
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
6109
6120
fi
Original file line number Diff line number Diff line change @@ -987,10 +987,14 @@ else
987
987
fi
988
988
rm -f conftest.c conftest.out
989
989
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] )
994
998
995
999
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
996
1000
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
@@ -1000,6 +1004,7 @@ elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
1000
1004
MULTIARCH=$PLATFORM_TRIPLET
1001
1005
fi
1002
1006
AC_SUBST ( PLATFORM_TRIPLET )
1007
+
1003
1008
if test x$MULTIARCH != x; then
1004
1009
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
1005
1010
fi
You can’t perform that action at this time.
0 commit comments