[PATCH 0/1] MR3560: configure: Fail if --enable-archs is used and any cross-compiler is missing.
For example, currently, if --enable-archs=i386,x86_64 is used, and there is an x86_64 cross compiler present but no i386 cross compiler, Wine will silently remove i386 from the list of cross-compiled architechtures, and only compile PE code for x86_64. This seems quite undesirable. I am not aware of any practical reason for this to happen. Debian does ship i686 and x86_64 MinGW compilers in separate packages, though, so it is possible in theory. -- I noticed this while looking into a different, related issue. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3560
From: Zebediah Figura <zfigura(a)codeweavers.com> For example, currently, if --enable-archs=i386,x86_64 is used, and there is an x86_64 cross compiler present but no i386 cross compiler, Wine will silently remove i386 from the list of cross-compiled architechtures, and only compile PE code for x86_64. This seems quite undesirable. I am not aware of any practical reason for this to happen. Debian does ship i686 and x86_64 MinGW compilers in separate packages, though, so it is possible in theory. --- configure | 41 ++++++++++++++++++++--------------------- configure.ac | 18 ++++++++++-------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/configure b/configure index df70e31a897..4d2b589de9b 100755 --- a/configure +++ b/configure @@ -5920,11 +5920,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_cxx11+y} +if test ${ac_cv_prog_cxx_11+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_cxx11=no + ac_cv_prog_cxx_11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5966,11 +5966,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_cxx98+y} +if test ${ac_cv_prog_cxx_98+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_cxx98=no + ac_cv_prog_cxx_98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10511,11 +10511,6 @@ test -n "$x86_64_CC" || x86_64_CC="false" esac fi - if eval test \"x\$"${wine_arch}_CC"\" = x"false" -then : - continue -fi - saved_CC=$CC saved_CFLAGS=$CFLAGS saved_LDFLAGS=$LDFLAGS @@ -10530,7 +10525,11 @@ fi target="" as_wine_cv_crosscc=`printf "%s\n" "ac_cv_${wine_arch}_crosscc" | $as_tr_sh` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC works" >&5 + if eval test \"x\$"${wine_arch}_CC"\" = x"false" +then : + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC works" >&5 printf %s "checking whether $CC works... " >&6; } if eval test \${$as_wine_cv_crosscc+y} then : @@ -10558,6 +10557,7 @@ fi eval ac_res=\$$as_wine_cv_crosscc { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 printf "%s\n" "$ac_res" >&6; } +fi if eval test \"x\$"$as_wine_cv_crosscc"\" = x"yes" then : set x $CC @@ -10626,6 +10626,11 @@ fi if test -z "$target" then + if test ${enable_archs+y} +then : + as_fn_error $? "MinGW $wine_arch compiler not found. +This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5 +fi CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS @@ -10675,6 +10680,11 @@ printf "%s\n" "unsupported" >&6; } CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS + if test ${enable_archs+y} +then : + as_fn_error $? "MinGW $wine_arch compiler supporting C99 not found. +This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5 +fi continue ;; x*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $res" >&5 @@ -11647,17 +11657,6 @@ if test $HOST_ARCH = aarch64 then test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 DLLEXT="" -else - if test "x$PE_ARCHS" = "x" -then : - case "x$with_mingw" in - x) as_fn_append wine_notices "|MinGW compiler not found, cross-compiling PE files won't be supported." ;; - xno) ;; - *) as_fn_error $? "MinGW compiler not found, cross-compiling PE files won't be supported. -This is an error since --with-mingw was requested." "$LINENO" 5 ;; -esac - -fi fi diff --git a/configure.ac b/configure.ac index cf26113ca06..80d88a94b33 100644 --- a/configure.ac +++ b/configure.ac @@ -849,8 +849,6 @@ do ;; esac]) - AS_VAR_IF([${wine_arch}_CC],[false],[continue]) - saved_CC=$CC saved_CFLAGS=$CFLAGS saved_LDFLAGS=$LDFLAGS @@ -864,9 +862,10 @@ do target="" AS_VAR_PUSHDEF([wine_cv_crosscc],[ac_cv_${wine_arch}_crosscc]) - AC_CACHE_CHECK([whether $CC works],[wine_cv_crosscc], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AS_VAR_SET([wine_cv_crosscc],[yes])],[AS_VAR_SET([wine_cv_crosscc],[no])])]) + AS_VAR_IF([${wine_arch}_CC],[false],[], + [AC_CACHE_CHECK([whether $CC works],[wine_cv_crosscc], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + [AS_VAR_SET([wine_cv_crosscc],[yes])],[AS_VAR_SET([wine_cv_crosscc],[no])])])]) AS_VAR_IF([wine_cv_crosscc],[yes], [set x $CC shift @@ -903,6 +902,9 @@ do if test -z "$target" then + AS_VAR_SET_IF([enable_archs], + [AC_MSG_ERROR([MinGW $wine_arch compiler not found. +This is an error since --enable-archs=$wine_arch was requested.])]) CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS @@ -930,6 +932,9 @@ do CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS + AS_VAR_SET_IF([enable_archs], + [AC_MSG_ERROR([MinGW $wine_arch compiler supporting C99 not found. +This is an error since --enable-archs=$wine_arch was requested.])]) continue ;; x*) AC_MSG_RESULT([$res]) @@ -1009,9 +1014,6 @@ if test $HOST_ARCH = aarch64 then test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) DLLEXT="" -else - WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"], - [MinGW compiler not found, cross-compiling PE files won't be supported.]) fi dnl **** External libraries **** -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3560
participants (2)
-
Zebediah Figura -
Zebediah Figura (＠zfigura)