public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-6144] libcody: More dashism
@ 2020-12-16 14:05 Nathan Sidwell
0 siblings, 0 replies; only message in thread
From: Nathan Sidwell @ 2020-12-16 14:05 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:6d972f5183d8d476cfb008b85e224aa9b90e628d
commit r11-6144-g6d972f5183d8d476cfb008b85e224aa9b90e628d
Author: Nathan Sidwell <nathan@acm.org>
Date: Wed Dec 16 06:03:38 2020 -0800
libcody: More dashism
There were still some dash-killing uses of +=. Fixed thusly.
* config.m4: Replace V+="..." with V="$V..."
* configure: Rebuilt.
Diff:
---
libcody/config.m4 | 17 +++++++++--------
libcody/configure | 13 +++++++------
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/libcody/config.m4 b/libcody/config.m4
index 801cfbdb593..ce5e84d0278 100644
--- a/libcody/config.m4
+++ b/libcody/config.m4
@@ -2,6 +2,8 @@
# Copyright (C) 2020 Nathan Sidwell, nathan@acm.org
# License: Apache v2.0
+# Note: VAR+=... is not dashing, despite its looks
+
AC_DEFUN([NMS_NOT_IN_SOURCE],
[if test -e configure ; then
AC_MSG_ERROR([Do not build in the source tree. Reasons])
@@ -28,14 +30,13 @@ fi])
AC_DEFUN([NMS_TOOL_DIRS],
[if test "$tools" && test -d "$tools/include" ; then
- CXX+=" -I$tools/include"
+ CXX="$CXX -I$tools/include"
fi
if test "$tools" && test -d "$tools/lib" ; then
toollib="$tools/lib"
if os=$(CXX -print-multi-os-directory 2>/dev/null) ; then
- toollib+="/${os}"
+ toollib="$toollib/${os}"
fi
- ## VAR+=... is not dashing
LDFLAGS="$LDFLAGS -L $toollib"
unset toollib
fi])
@@ -86,7 +87,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
]])],
[AC_MSG_RESULT([yes])],
[CXX_ORIG="$CXX"
-CXX+=" -std=c++11"
+CXX="$CXX -std=c++11"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
[#if __cplusplus != 201103
#error "C++11 is required"
@@ -112,7 +113,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
#endif
]])],
[AC_MSG_RESULT([yes])],
-[CXX+=" -std=c++20"
+[CXX="$CXX -std=c++20"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
[#if __cplusplus <= 201703
#error "C++20 is required"
@@ -248,7 +249,7 @@ if test "${enable_backtrace:-maybe}" != no ; then
AC_CHECK_HEADERS([demangle.h libiberty/demangle.h],[break])
# libbfd prevents distribution because of licensing
AC_CHECK_HEADERS([bfd.h])
- AC_SEARCH_LIBS([bfd_openr],[bfd],[LIBS+="-lz -liberty -ldl"],,[-lz -liberty -ldl])
+ AC_SEARCH_LIBS([bfd_openr],[bfd],[LIBS="$LIBS -lz -liberty -ldl"],,[-lz -liberty -ldl])
fi
if test "$ac_cv_func_backtrace" = yes ; then
nms_backtrace=yes
@@ -272,8 +273,8 @@ for generated in config.h.in configure ; do
done
for dir in . $SUBDIRS
do
- CONFIG_FILES+=" $dir/Makesub"
- test -f ${srcdir}/$dir/tests/Makesub.in && CONFIG_FILES+=" $dir/tests/Makesub"
+ CONFIG_FILES="$CONFIG_FILES $dir/Makesub"
+ test -f ${srcdir}/$dir/tests/Makesub.in && CONFIG_FILES="$CONFIG_FILES $dir/tests/Makesub"
done
AC_CONFIG_FILES([$CONFIG_FILES])
AC_SUBST(configure_args,[$ac_configure_args])
diff --git a/libcody/configure b/libcody/configure
index 1a119c59b9f..4cc03dcaa3a 100755
--- a/libcody/configure
+++ b/libcody/configure
@@ -1824,6 +1824,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Copyright (C) 2020 Nathan Sidwell, nathan@acm.org
# License: Apache v2.0
+# Note: VAR+=... is not dashing, despite its looks
+
# thanks to Zack Weinberg for fixing this!
@@ -2574,7 +2576,7 @@ if ac_fn_cxx_try_compile "$LINENO"; then :
$as_echo "yes" >&6; }
else
CXX_ORIG="$CXX"
-CXX+=" -std=c++11"
+CXX="$CXX -std=c++11"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -2625,14 +2627,13 @@ unset CXX_ORIG
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$tools" && test -d "$tools/include" ; then
- CXX+=" -I$tools/include"
+ CXX="$CXX -I$tools/include"
fi
if test "$tools" && test -d "$tools/lib" ; then
toollib="$tools/lib"
if os=$(CXX -print-multi-os-directory 2>/dev/null) ; then
- toollib+="/${os}"
+ toollib="$toollib/${os}"
fi
- ## VAR+=... is not dashing
LDFLAGS="$LDFLAGS -L $toollib"
unset toollib
fi
@@ -2671,8 +2672,8 @@ for generated in config.h.in configure ; do
done
for dir in . $SUBDIRS
do
- CONFIG_FILES+=" $dir/Makesub"
- test -f ${srcdir}/$dir/tests/Makesub.in && CONFIG_FILES+=" $dir/tests/Makesub"
+ CONFIG_FILES="$CONFIG_FILES $dir/Makesub"
+ test -f ${srcdir}/$dir/tests/Makesub.in && CONFIG_FILES="$CONFIG_FILES $dir/tests/Makesub"
done
ac_config_files="$ac_config_files $CONFIG_FILES"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-12-16 14:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-16 14:05 [gcc r11-6144] libcody: More dashism Nathan Sidwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).