[PATCH v2 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. -- v2: winegcc: Support --no-default-config argument. 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.ac | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) 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
participants (2)
-
Jacek Caban -
Jacek Caban (＠jacek)