From: Wayne Davison <wayne@opencoder.net>
Date: Sun, 21 Jun 2020 02:23:07 +0000 (-0700)
Subject: Get rid of -g option in CXXFLAGS (at least for now).
X-Git-Tag: v3.2.1pre1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b37a136314f250fc837d2836a923ffd441e847ca;p=thirdparty%2Frsync.git

Get rid of -g option in CXXFLAGS (at least for now).
---

diff --git a/configure.ac b/configure.ac
index c99fe076..53e1a609 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,7 +227,7 @@ inline void more_testing(char* buf, int len)
 	AC_LANG(C)
 	if test x"$CXX_OK" = x"yes"; then
 	    # AC_MSG_RESULT() is called below.
-	    SIMD="$SIMD x86_64"
+	    SIMD="x86_64"
 	elif test x"$enable_simd" = x"yes"; then
 	    AC_MSG_RESULT(error)
 	    AC_MSG_ERROR(The SIMD compilation test failed.
@@ -241,10 +241,11 @@ Omit --enable-simd to continue without it.)
 fi
 
 if test x"$SIMD" != x""; then
-    SIMD=`echo "$SIMD" | sed 's/^ *//'`
     AC_MSG_RESULT([yes ($SIMD)])
     AC_DEFINE(HAVE_SIMD, 1, [Define to 1 to enable SIMD optimizations])
-    SIMD=`echo '$(SIMD_'"$SIMD)" | sed 's/ /) $(SIMD_/g'`
+    SIMD='$(SIMD_'"$SIMD)"
+    # Clag is crashing with -g -O2, so we'll get rid of -g (just for the one file).
+    CXXFLAGS=`echo "'$CXXFLAGS'" | sed 's/-g //'`
     # We only use c++ for its target attribute dispatching, disable unneeded bulky features
     CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti"
 else