The branch, master has been updated
via a93eb4cf Handle a missing c++ too.
from 7fd24bef Make SIMD enabled by default again (for x86_64)
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a93eb4cf381e0424e242f456991f6efbb9b876cf
Author: Wayne Davison <wa...@opencoder.net>
Date: Thu Jun 18 17:02:46 2020 -0700
Handle a missing c++ too.
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/configure.ac b/configure.ac
index 3330eb90..85b97914 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,9 +203,9 @@ AC_ARG_ENABLE(simd,
if test x"$enable_simd" != x"no"; then
# For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
if test x"$build_cpu" = x"x86_64"; then
+ CXX_OK=
if test x"$CXX" != x""; then
- CXX_OK=
- CXX_VERSION=`$CXX --version | head -n 1`
+ CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1`
case "$CXX_VERSION" in
g++*)
CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'`
@@ -220,16 +220,21 @@ if test x"$enable_simd" != x"no"; then
CXX_OK=yes
fi
;;
+ *)
+ CXX_VERSION='Unknown'
+ ;;
esac
-
- if test x"$CXX_OK" = x"yes"; then
- # AC_MSG_RESULT() is called below.
- SIMD="$SIMD x86_64"
- else
- AC_MSG_RESULT(error)
- AC_MSG_ERROR([Failed to find g++ >=5 or clang++ >=7 for SIMD
optimizations.
+ else
+ CXX='No c++'
+ CXX_VERSION='Unknown'
+ fi
+ if test x"$CXX_OK" = x"yes"; then
+ # AC_MSG_RESULT() is called below.
+ SIMD="$SIMD x86_64"
+ else
+ AC_MSG_RESULT(error)
+ AC_MSG_ERROR([Failed to find g++ >=5 or clang++ >=7 for SIMD
optimizations.
Specify --disable-simd to continue without it. ($CXX, $CXX_VERSION)])
- fi
fi
elif test x"$enable_simd" = x"yes"; then
AC_MSG_RESULT(unavailable)
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
