Module: wine Branch: master Commit: abe79e3b52db97cd955574de4c10b22435b2c22f URL: https://gitlab.winehq.org/wine/wine/-/commit/abe79e3b52db97cd955574de4c10b22...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Jul 6 13:27:36 2023 +0200
configure: Don't try to use a non-compliant cross-compiler.
---
configure | 11 ++++++++--- configure.ac | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/configure b/configure index 262222bfed4..73b29c92241 100755 --- a/configure +++ b/configure @@ -10690,7 +10690,6 @@ fi LDFLAGS=$saved_LDFLAGS 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`
@@ -10726,17 +10725,23 @@ fi fi
eval res=$$as_wine_cv_crosscc_c99 + case "x$res" in x) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } ;; xno) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } ;; +printf "%s\n" "unsupported" >&6; } + CC=$saved_CC + CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS + continue + ;; x*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $res" >&5 printf "%s\n" "$res" >&6; } as_fn_append ${wine_arch}_CC " $res" ;; esac
- + as_fn_append PE_ARCHS " $wine_arch" { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-fno-strict-aliasing" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fno-strict-aliasing" >&5 printf %s "checking whether $CC supports -fno-strict-aliasing... " >&6; } diff --git a/configure.ac b/configure.ac index d43dc662eb3..63dc4f65980 100644 --- a/configure.ac +++ b/configure.ac @@ -902,7 +902,6 @@ do LDFLAGS=$saved_LDFLAGS 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]) @@ -918,14 +917,20 @@ do AS_VAR_IF([wine_cv_crosscc_c99],[no],[],[break]) done]) AS_VAR_COPY([res],[wine_cv_crosscc_c99]) + AS_VAR_POPDEF([wine_cv_crosscc_c99]) case "x$res" in x) AC_MSG_RESULT([none needed]) ;; - xno) AC_MSG_RESULT([unsupported]) ;; + xno) AC_MSG_RESULT([unsupported]) + CC=$saved_CC + CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS + continue + ;; x*) AC_MSG_RESULT([$res]) AS_VAR_APPEND([${wine_arch}_CC],[" $res"]) ;; esac - AS_VAR_POPDEF([wine_cv_crosscc_c99])
+ AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"]) WINE_TRY_PE_CFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options WINE_TRY_PE_CFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"])