only update LDFLAGS if the configure checks pass

diff --git a/configure b/configure
index 501dde98a898ddf83452710b12f6fb486d108759..ca09916d042ef0f5c38c797db8f002329982956c 100755 (executable)
--- a/configure
+++ b/configure
@@ -4942,10 +4942,8 @@ printf "%s\n" "$ax_cv_cc_unwindlib_arg" >&6; }
   clang_path="$CC"
 
 
-    LDFLAGS="$LDFLAGS --rtlib=compiler-rt"
-
   if test "x$ax_cv_cc_unwindlib_arg" = "xyes"; then
-    LDFLAGS="$LDFLAGS --unwindlib=libunwind"
+        LDFLAGS="$LDFLAGS --rtlib=compiler-rt --unwindlib=libunwind"
   fi
 else
   clang_path=""

diff --git a/configure.ac b/configure.ac
index 365459dfb938200c246aec2a93addd258d4b0fa9..a94d31b82463c0b8523d5af9a487a63b9f2f7df4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -331,11 +331,9 @@ if test "x$ax_cv_cc_clang" = "xyes"; then
   AX_CC_UNWINDLIB_ARG
   AC_SUBST(clang_path, "$CC")
 
-  dnl # Needed for builtins to function correctly (https://bugs.gentoo.org/702344)
-  LDFLAGS="$LDFLAGS --rtlib=compiler-rt"
-
   if test "x$ax_cv_cc_unwindlib_arg" = "xyes"; then
-    LDFLAGS="$LDFLAGS --unwindlib=libunwind"
+    dnl # For GCC, use --rtlib=libgcc --unwindlib=libgcc
+    LDFLAGS="$LDFLAGS --rtlib=compiler-rt --unwindlib=libunwind"
   fi
 else
   AC_SUBST(clang_path, "")