[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  b37a1363 Get rid of -g option in CXXFLAGS (at least for now).
       via  c9c8c645 Remove leftover case match.
      from  c5d502dc When fetching gen files, make sure aclocal.m4 is older than configure files.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b37a136314f250fc837d2836a923ffd441e847ca
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sat Jun 20 19:23:07 2020 -0700

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

commit c9c8c64506f1475db020435f41d7dd0963e8c892
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sat Jun 20 19:00:57 2020 -0700

    Remove leftover case match.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac   | 7 ++++---
 prepare-source | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

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
diff --git a/prepare-source b/prepare-source
index 14ec1b69..aa4e9d12 100755
--- a/prepare-source
+++ b/prepare-source
@@ -35,8 +35,6 @@ for action in "${@}"; do
 	sleep 1 # The following files need to be newer than aclocal.m4
 	touch configure.sh config.h.in
 	;;
-    fetchgen)
-	;;
     fetchSRC)
 	./rsync-ssl -iipr --no-motd --exclude=/.git/ rsync://download.samba.org/ftp/pub/unpacked/rsync/ .
 	;;


-- 
The rsync repository.