configure: Fix restoring CFLAGS after the test for -Wl,-z,defs.

This fixes a regression from 450c3588; after testing for -Wl,-z,defs, CFLAGS was restored from an incorrect variable, leaving CFLAGS essentially empty. This would break builds for e.g. arm with Clang, where -mthumb would be essential for being able to build some inline assembly snippets correctly. This also had the effect of dropping the default "-g -O2" arguments from CFLAGS. Signed-off-by: Martin Storsjö <martin@martin.st>

configure: Fix restoring CFLAGS after the test for -Wl,-z,defs.
2c752402 · Martin Storsjö · Alexandre Julliard · 16217163 · 2c752402 · 2c752402
Commit 2c752402 authored Oct 04, 2023 by Martin Storsjö Committed by Alexandre Julliard Oct 04, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

configure configure +1 -1

configure.ac configure.ac +1 -1

No files found.
--- a/configure
+++ b/configure
@@ -10123,7 +10123,7 @@ else $as_nop
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
    conftest$ac_exeext conftest.$ac_ext
-                    CFLAGS=$ac_save_cflags
+                    CFLAGS=$ac_save_CFLAGS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wl_z_defs" >&5
 printf "%s\n" "$ac_cv_wl_z_defs" >&6; }

--- a/configure.ac
+++ b/configure.ac
@@ -771,7 +771,7 @@ case $host_os in
                    dnl On FreeBSD, shared libraries using environ fail to link with -Wl,-z,defs
                    AC_LINK_IFELSE([AC_LANG_SOURCE([[extern char **environ; char **envp; void myfunc(void) { envp = environ; }]])],
                                                   [ac_cv_wl_z_defs=yes],[ac_cv_wl_z_defs=no])
-                    CFLAGS=$ac_save_cflags])
+                    CFLAGS=$ac_save_CFLAGS])
    test $ac_cv_wl_z_defs != yes || AS_VAR_APPEND([UNIXLDFLAGS],[" -Wl,-z,defs"])
    WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"])