Alexandre Julliard : configure: Cache result of the cross-compiler check.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2b5dc2ebd57d3119be6a9cb63482fbb434b8bf34
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2b5dc2ebd57d3119be6a9cb63482fbb434b8bf34

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sun Apr 14 14:48:39 2019 +0200

configure: Cache result of the cross-compiler check.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 configure    | 37 ++++++++++++++++++++++---------------
 configure.ac | 29 +++++++++++++++--------------
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/configure b/configure
index 15f7848..31fcebb 100755
--- a/configure
+++ b/configure
@@ -9679,7 +9679,10 @@ test -n "$CROSSCC" || CROSSCC="false"
         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
+if ${wine_cv_crosscc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9691,23 +9694,27 @@ main ()
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-                           set x $CROSSCC
-                           shift
-                           while test $# -ge 1
-                           do
-                               case "$1" in
-                                 *-gcc) CROSSTARGET=`expr "$1" : '\(.*\)-gcc'` ;;
-                                 *-clang) CROSSTARGET=`expr "$1" : '\(.*\)-clang'` ;;
-                               esac
-                               shift
-                           done
+  wine_cv_crosscc=yes
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  wine_cv_crosscc=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_crosscc" >&5
+$as_echo "$wine_cv_crosscc" >&6; }
+        if test $wine_cv_crosscc = yes
+        then
+            set x $CROSSCC
+            shift
+            while test $# -ge 1
+            do
+                case "$1" in
+                    *-gcc) CROSSTARGET=`expr "$1" : '\(.*\)-gcc'` ;;
+                    *-clang) CROSSTARGET=`expr "$1" : '\(.*\)-clang'` ;;
+                esac
+                shift
+            done
+        fi
         { $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_crosscflags__fno_strict_aliasing+:} false; then :
diff --git a/configure.ac b/configure.ac
index b459e0e..51ca0fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1007,20 +1007,21 @@ then
 
         CC="$CROSSCC"
         CFLAGS=$CROSSCFLAGS
-        AC_MSG_CHECKING([whether $CROSSCC works])
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
-                          [AC_MSG_RESULT([yes])
-                           set x $CROSSCC
-                           shift
-                           while test $# -ge 1
-                           do
-                               case "$1" in
-                                 *-gcc) CROSSTARGET=`expr "$1" : '\(.*\)-gcc'` ;;
-                                 *-clang) CROSSTARGET=`expr "$1" : '\(.*\)-clang'` ;;
-                               esac
-                               shift
-                           done],
-                          [AC_MSG_RESULT([no])])
+        AC_CACHE_CHECK([whether $CROSSCC works], wine_cv_crosscc,
+            [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],[wine_cv_crosscc=yes],[wine_cv_crosscc=no])])
+        if test $wine_cv_crosscc = yes
+        then
+            set x $CROSSCC
+            shift
+            while test $# -ge 1
+            do
+                case "$1" in
+                    *-gcc) CROSSTARGET=`expr "$1" : '\(.*\)-gcc'` ;;
+                    *-clang) CROSSTARGET=`expr "$1" : '\(.*\)-clang'` ;;
+                esac
+                shift
+            done
+        fi
         WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing])
         dnl clang needs to be told to fail on unknown options
         WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"])