[PATCH 0/1] MR6851: configure: Preserve original CFLAGS when adding LLVM flags.
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 471d7178ae01. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6851
From: Jacek Caban <jacek(a)codeweavers.com> 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 471d7178ae01. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index dd80e0c06d8..3f8be71bd21 100644 --- a/configure.ac +++ b/configure.ac @@ -879,7 +879,7 @@ do 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" + CFLAGS="$CFLAGS $llvm_extra_cflags $llvm_cflags" else AS_VAR_PUSHDEF([wine_cv_crosscc], [wine_cv_${wine_arch}_crosscc]) AC_CACHE_CHECK([whether $CC works], wine_cv_crosscc, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6851
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=149776 Your paranoid android. === debian11b (64 bit WoW report) === user32: win.c:4070: Test failed: Expected active window 0000000003DC0162, got 0000000000000000. win.c:4071: Test failed: Expected focus window 0000000003DC0162, got 0000000000000000.
participants (3)
-
Jacek Caban -
Jacek Caban (@jacek) -
Marvin