Module: wine Branch: master Commit: 266c97107b698ef70946e27b14b9529e9b4bc7e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/266c97107b698ef70946e27b14b9529...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Nov 15 21:14:18 2022 +0100
configure: Skip the rest of the PE checks if the cross-compiler isn't detected.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53923
---
configure | 9 ++++++++- configure.ac | 11 +++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/configure b/configure index 0f8d5ff5044..8f780aff3ad 100755 --- a/configure +++ b/configure @@ -10886,10 +10886,17 @@ then : CFLAGS="$CFLAGS -target $target $llvm_cflags" fi } eval "${wine_arch}_TARGET=$target" - PE_ARCHS="$PE_ARCHS $wine_arch" fi
+ if test -z "$target" + then + CC=$saved_CC + CFLAGS=$saved_CFLAGS + continue + fi + as_fn_append PE_ARCHS " $wine_arch" + as_wine_cv_crosscc_c99=`printf "%s\n" "ac_cv_${wine_arch}_crosscc_c99" | $as_tr_sh`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 diff --git a/configure.ac b/configure.ac index 076d30e581d..1d0ae5c3fc2 100644 --- a/configure.ac +++ b/configure.ac @@ -951,10 +951,17 @@ do AS_VAR_SET([${wine_arch}_DELAYLOADFLAG],["-Wl,-delayload,"]) AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" -target $target"]) CFLAGS="$CFLAGS -target $target $llvm_cflags"]) - AS_VAR_SET([${wine_arch}_TARGET],[$target]) - PE_ARCHS="$PE_ARCHS $wine_arch"]) + AS_VAR_SET([${wine_arch}_TARGET],[$target])]) AS_VAR_POPDEF([wine_cv_crosscc])
+ if test -z "$target" + then + CC=$saved_CC + CFLAGS=$saved_CFLAGS + continue + fi + AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"]) + AS_VAR_PUSHDEF([wine_cv_crosscc_c99],[ac_cv_${wine_arch}_crosscc_c99]) AC_MSG_CHECKING([for $CC option to enable C99 features]) AC_CACHE_VAL([wine_cv_crosscc_c99],