[PATCH v3 0/3] MR4492: configure: Use --no-default-config option on clang when available.
Some distros arbitrary flags into clang config files without guarding it for applicable targets, which breaks cross compilation. -- v3: winegcc: Support --no-default-config argument. configure: Use --no-default-config option on clang when available. configure: Fix action-if-no handling in WINE_TRY_PE_CFLAGS macro. https://gitlab.winehq.org/wine/wine/-/merge_requests/4492
From: Jacek Caban <jacek(a)codeweavers.com> --- aclocal.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index 11d7e3a3bef..5f1e7bbdbf3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -218,7 +218,7 @@ int __cdecl mainCRTStartup(void) { return 0; }]])], [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) CFLAGS=$ac_wine_try_cflags_saved ac_exeext=$ac_wine_try_cflags_saved_exeext]) -AS_VAR_IF([ac_var],[yes],[m4_default([$2], [AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $1"])], [$3])])dnl +AS_VAR_IF([ac_var],[yes],[m4_default([$2], [AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $1"])])], [$3])dnl AS_VAR_POPDEF([ac_var]) }]) dnl **** Check whether the given MinGW header is available **** -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4492
From: Jacek Caban <jacek(a)codeweavers.com> Some distros arbitrary flags into clang config files without guarding it for applicable targets, which breaks cross compilation. --- configure | 54 +++++++++++++++++++++++++++++++++++++++++++++++----- configure.ac | 19 +++++++++++++----- 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/configure b/configure index e6fa429c8bf..3b8ec628bfb 100755 --- a/configure +++ b/configure @@ -10654,10 +10654,46 @@ then : esac fi llvm_extra_cflags="-target $llvm_target -fuse-ld=lld" + llvm_extra_ldflags="" case $llvm_target in *windows) llvm_cflags="-Wl,-subsystem:console -Wl,-WX" ;; esac - { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags" | $as_tr_sh` + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags --no-default-config" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $llvm_extra_cflags $llvm_cflags --no-default-config" >&5 +printf %s "checking whether $CC supports $llvm_extra_cflags $llvm_cflags --no-default-config... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs $llvm_extra_cflags $llvm_cflags --no-default-config" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void *__os_arm64x_dispatch_ret = 0; +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + llvm_extra_cflags="$llvm_extra_cflags --no-default-config" + llvm_extra_ldflags="--no-default-config" +else $as_nop + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $llvm_extra_cflags $llvm_cflags" >&5 printf %s "checking whether $CC supports $llvm_extra_cflags $llvm_cflags... " >&6; } if eval test \${$as_ac_var+y} @@ -10689,11 +10725,19 @@ eval ac_res=\$$as_ac_var printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_var"\" = x"yes" then : - target=$llvm_target - eval "${wine_arch}_DELAYLOADFLAG=\"-Wl,-delayload,\"" - as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags" - CFLAGS="$llvm_extra_cflags $llvm_cflags" + as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags $llvm_cflags" +else $as_nop + llvm_extra_cflags="" +fi } fi } + if test -n "$llvm_extra_cflags" + then + target=$llvm_target + eval "${wine_arch}_DELAYLOADFLAG=\"-Wl,-delayload,\"" + as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags" + as_fn_append ${wine_arch}_LDFLAGS " $llvm_extra_ldflags" + CFLAGS="$llvm_extra_cflags $llvm_cflags" + fi eval "${wine_arch}_TARGET=\$target" fi diff --git a/configure.ac b/configure.ac index 8d92e4c8ab2..074086c586b 100644 --- a/configure.ac +++ b/configure.ac @@ -893,14 +893,23 @@ do esac fi llvm_extra_cflags="-target $llvm_target -fuse-ld=lld" + llvm_extra_ldflags="" case $llvm_target in *windows) llvm_cflags="-Wl,-subsystem:console -Wl,-WX" ;; esac - WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags], - [target=$llvm_target - AS_VAR_SET([${wine_arch}_DELAYLOADFLAG],["-Wl,-delayload,"]) - AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $llvm_extra_cflags"]) - CFLAGS="$llvm_extra_cflags $llvm_cflags"]) + WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags --no-default-config], + [llvm_extra_cflags="$llvm_extra_cflags --no-default-config" + llvm_extra_ldflags="--no-default-config"], + [WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags],[], + [llvm_extra_cflags=""])]) + if test -n "$llvm_extra_cflags" + then + target=$llvm_target + AS_VAR_SET([${wine_arch}_DELAYLOADFLAG],["-Wl,-delayload,"]) + AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $llvm_extra_cflags"]) + AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" $llvm_extra_ldflags"]) + CFLAGS="$llvm_extra_cflags $llvm_cflags" + fi AS_VAR_SET([${wine_arch}_TARGET],[$target])]) AS_VAR_POPDEF([wine_cv_crosscc]) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4492
From: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index dc085a2ed0f..56fe179c92b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -177,6 +177,7 @@ struct options int unwind_tables; int strip; int pic; + int no_default_config; const char* wine_objdir; const char* winebuild; const char* output_name; @@ -299,6 +300,7 @@ static struct strarray build_tool_name( struct options *opts, enum tool tool ) } strarray_add( &ret, "-Wno-unused-command-line-argument" ); strarray_add( &ret, "-fuse-ld=lld" ); + if (opts->no_default_config) strarray_add( &ret, "--no-default-config" ); } return ret; } @@ -1851,6 +1853,11 @@ int main(int argc, char **argv) case '-': if (strcmp("-static", opts.args.str[i]+1) == 0) linking = -1; + else if (!strcmp( "-no-default-config", opts.args.str[i] + 1 )) + { + opts.no_default_config = 1; + raw_compiler_arg = raw_linker_arg = 1; + } else if (is_option( &opts, i, "--sysroot", &option_arg )) { opts.sysroot = option_arg; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4492
This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4492
participants (3)
-
Alexandre Julliard (＠julliard) -
Jacek Caban
-
Jacek Caban (＠jacek)