zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: Preserve original CFLAGS when adding LLVM flags.

Browse source 
Ensure that the specified CROSSCFLAGS (or its default value) is applied consistently during
toolchain checks. Also fixes debug format recognition.

The regression was introduced in commit 471d7178ae.
This commit is contained in:
Jacek Caban 2024-11-19 17:37:39 +01:00 committed by Alexandre Julliard
parent 005c8b8b9d
commit 34dce6335a
Notes: Alexandre Julliard 2024-11-19 23:24:00 +01:00 
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/wine/merge_requests/6851
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure generated vendored
View file

@ -10483,7 +10483,7 @@ fi }
eval "${wine_arch}_DELAYLOADFLAG=\"-Wl,-delayload,\"" eval "${wine_arch}_DELAYLOADFLAG=\"-Wl,-delayload,\""
as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags" as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags"
as_fn_append ${wine_arch}_LDFLAGS " $llvm_extra_ldflags" as_fn_append ${wine_arch}_LDFLAGS " $llvm_extra_ldflags"
CFLAGS="$llvm_extra_cflags $llvm_cflags" CFLAGS="$CFLAGS $llvm_extra_cflags $llvm_cflags"
else else
as_wine_cv_crosscc=`printf "%s\n" "wine_cv_${wine_arch}_crosscc" | sed "$as_sed_sh"` as_wine_cv_crosscc=`printf "%s\n" "wine_cv_${wine_arch}_crosscc" | sed "$as_sed_sh"`

2
configure.ac
View file

@ -879,7 +879,7 @@ do
AS_VAR_SET([${wine_arch}_DELAYLOADFLAG],["-Wl,-delayload,"]) AS_VAR_SET([${wine_arch}_DELAYLOADFLAG],["-Wl,-delayload,"])
AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $llvm_extra_cflags"]) AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $llvm_extra_cflags"])
AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" $llvm_extra_ldflags"]) AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" $llvm_extra_ldflags"])
CFLAGS="$llvm_extra_cflags $llvm_cflags" CFLAGS="$CFLAGS $llvm_extra_cflags $llvm_cflags"
else else
AS_VAR_PUSHDEF([wine_cv_crosscc], [wine_cv_${wine_arch}_crosscc]) AS_VAR_PUSHDEF([wine_cv_crosscc], [wine_cv_${wine_arch}_crosscc])
AC_CACHE_CHECK([whether $CC works], wine_cv_crosscc, AC_CACHE_CHECK([whether $CC works], wine_cv_crosscc,