Alexandre Julliard : configure: Use CROSSCFLAGS when testing the cross-compiler.
Alexandre Julliard
julliard at winehq.org
Mon Apr 8 15:11:59 CDT 2019
Module: wine
Branch: master
Commit: b8a6693e196f0f7f42bafa6a8e5d99f631d4ccdf
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8a6693e196f0f7f42bafa6a8e5d99f631d4ccdf
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Apr 8 09:43:03 2019 +0200
configure: Use CROSSCFLAGS when testing the cross-compiler.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 28 ++++++++++++++++------------
configure.ac | 24 ++++++++++++++----------
2 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/configure b/configure
index ee80a75..bacbd3e 100755
--- a/configure
+++ b/configure
@@ -9669,7 +9669,14 @@ test -n "$CROSSCC" || CROSSCC="false"
if test "$CROSSCC" != "false"
then
ac_save_CC="$CC"
+ saved_CFLAGS=$CFLAGS
+ CROSSCFLAGS=${CROSSCFLAGS:-$CFLAGS}
+
+ EXTRACROSSCFLAGS="-DWINE_CROSSTEST -Wall"
+
+
CC="$CROSSCC"
+ CFLAGS=$CROSSCFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CROSSCC works" >&5
$as_echo_n "checking whether $CROSSCC works... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9701,13 +9708,6 @@ else
$as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CC="$ac_save_CC"
- CROSSCFLAGS=${CROSSCFLAGS:-$CFLAGS}
-
- EXTRACROSSCFLAGS="-DWINE_CROSSTEST -Wall"
-
-
- saved_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fno-strict-aliasing" >&5
$as_echo_n "checking whether the cross-compiler supports -fno-strict-aliasing... " >&6; }
if ${ac_cv_cflags__fno_strict_aliasing+:} false; then :
@@ -9739,7 +9739,7 @@ $as_echo "$ac_cv_cflags__fno_strict_aliasing" >&6; }
if test "x$ac_cv_cflags__fno_strict_aliasing" = xyes; then :
EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -fno-strict-aliasing"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror=unknown-warning-option" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror=unknown-warning-option" >&5
$as_echo_n "checking whether the cross-compiler supports -Werror=unknown-warning-option... " >&6; }
if ${ac_cv_cflags__Werror_unknown_warning_option+:} false; then :
$as_echo_n "(cached) " >&6
@@ -10239,9 +10239,7 @@ if test "x$ac_cv_cflags__Wno_format" = xyes; then :
fi ;;
esac
- CFLAGS=$saved_CFLAGS
-
- for ac_flag in $CFLAGS; do
+ for ac_flag in $CROSSCFLAGS; do
case $ac_flag in
-g) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gdwarf-2" >&5
$as_echo_n "checking whether the cross-compiler supports -gdwarf-2... " >&6; }
@@ -10308,7 +10306,9 @@ fi ;;
esac
done
- test "x$enable_maintainer_mode" != "xyes" || { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror" >&5
+ if test "x$enable_maintainer_mode" = xyes
+ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror" >&5
$as_echo_n "checking whether the cross-compiler supports -Werror... " >&6; }
if ${ac_cv_cflags__Werror+:} false; then :
$as_echo_n "(cached) " >&6
@@ -10339,6 +10339,10 @@ $as_echo "$ac_cv_cflags__Werror" >&6; }
if test "x$ac_cv_cflags__Werror" = xyes; then :
EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Werror"
fi
+ fi
+
+ CFLAGS=$saved_CFLAGS
+ CC="$ac_save_CC"
fi
fi
if test "x$CROSSTARGET" = "x"; then :
diff --git a/configure.ac b/configure.ac
index 1311309..b0b7080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1002,7 +1002,12 @@ then
if test "$CROSSCC" != "false"
then
ac_save_CC="$CC"
+ saved_CFLAGS=$CFLAGS
+ AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-$CFLAGS})
+ AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSSTEST -Wall")
+
CC="$CROSSCC"
+ CFLAGS=$CROSSCFLAGS
AC_MSG_CHECKING([whether $CROSSCC works])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
[AC_MSG_RESULT([yes])
@@ -1017,13 +1022,8 @@ then
shift
done],
[AC_MSG_RESULT([no])])
- CC="$ac_save_CC"
- AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-$CFLAGS})
- AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSSTEST -Wall")
-
- dnl clang needs to be told to fail on unknown options
- saved_CFLAGS=$CFLAGS
WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing])
+ dnl clang needs to be told to fail on unknown options
WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option])
WINE_TRY_CROSSCFLAGS([-Wdeclaration-after-statement])
WINE_TRY_CROSSCFLAGS([-Wempty-body])
@@ -1044,17 +1044,21 @@ then
x86_64) WINE_TRY_CROSSCFLAGS([-Wno-format]) ;;
esac
- CFLAGS=$saved_CFLAGS
-
dnl Default to dwarf-2 debug info
- for ac_flag in $CFLAGS; do
+ for ac_flag in $CROSSCFLAGS; do
case $ac_flag in
-g) WINE_TRY_CROSSCFLAGS([-gdwarf-2])
WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;;
esac
done
- test "x$enable_maintainer_mode" != "xyes" || WINE_TRY_CROSSCFLAGS([-Werror])
+ if test "x$enable_maintainer_mode" = xyes
+ then
+ WINE_TRY_CROSSCFLAGS([-Werror])
+ fi
+
+ CFLAGS=$saved_CFLAGS
+ CC="$ac_save_CC"
fi
fi
WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"],
More information about the wine-cvs
mailing list