[PATCH 1/1] configure: Preserve original CFLAGS when adding LLVM flags.

[Jacek Caban]

From: Jacek Caban

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,