Commit abe79e3b authored by Alexandre Julliard's avatar Alexandre Julliard

configure: Don't try to use a non-compliant cross-compiler.

parent 8f27e8f6
...@@ -10690,7 +10690,6 @@ fi ...@@ -10690,7 +10690,6 @@ fi
LDFLAGS=$saved_LDFLAGS LDFLAGS=$saved_LDFLAGS
continue continue
fi 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` as_wine_cv_crosscc_c99=`printf "%s\n" "ac_cv_${wine_arch}_crosscc_c99" | $as_tr_sh`
...@@ -10726,17 +10725,23 @@ fi ...@@ -10726,17 +10725,23 @@ fi
fi fi
eval res=\$$as_wine_cv_crosscc_c99 eval res=\$$as_wine_cv_crosscc_c99
case "x$res" in case "x$res" in
x) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 x) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
printf "%s\n" "none needed" >&6; } ;; printf "%s\n" "none needed" >&6; } ;;
xno) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 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 x*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $res" >&5
printf "%s\n" "$res" >&6; } printf "%s\n" "$res" >&6; }
as_fn_append ${wine_arch}_CC " $res" ;; as_fn_append ${wine_arch}_CC " $res" ;;
esac 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` { 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\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fno-strict-aliasing" >&5
printf %s "checking whether $CC supports -fno-strict-aliasing... " >&6; } printf %s "checking whether $CC supports -fno-strict-aliasing... " >&6; }
......
...@@ -902,7 +902,6 @@ do ...@@ -902,7 +902,6 @@ do
LDFLAGS=$saved_LDFLAGS LDFLAGS=$saved_LDFLAGS
continue continue
fi fi
AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"])
AS_VAR_PUSHDEF([wine_cv_crosscc_c99],[ac_cv_${wine_arch}_crosscc_c99]) AS_VAR_PUSHDEF([wine_cv_crosscc_c99],[ac_cv_${wine_arch}_crosscc_c99])
AC_MSG_CHECKING([for $CC option to enable C99 features]) AC_MSG_CHECKING([for $CC option to enable C99 features])
...@@ -918,14 +917,20 @@ do ...@@ -918,14 +917,20 @@ do
AS_VAR_IF([wine_cv_crosscc_c99],[no],[],[break]) AS_VAR_IF([wine_cv_crosscc_c99],[no],[],[break])
done]) done])
AS_VAR_COPY([res],[wine_cv_crosscc_c99]) AS_VAR_COPY([res],[wine_cv_crosscc_c99])
AS_VAR_POPDEF([wine_cv_crosscc_c99])
case "x$res" in case "x$res" in
x) AC_MSG_RESULT([none needed]) ;; 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]) x*) AC_MSG_RESULT([$res])
AS_VAR_APPEND([${wine_arch}_CC],[" $res"]) ;; AS_VAR_APPEND([${wine_arch}_CC],[" $res"]) ;;
esac esac
AS_VAR_POPDEF([wine_cv_crosscc_c99])
AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"])
WINE_TRY_PE_CFLAGS([-fno-strict-aliasing]) WINE_TRY_PE_CFLAGS([-fno-strict-aliasing])
dnl clang needs to be told to fail on unknown options 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"]) WINE_TRY_PE_CFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment