aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-09-06 18:43:10 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-09-06 18:43:41 +0900
commit733aa2f8b578d03bbcb91d2f496b01e3b990c7e8 (patch)
tree14751755efdbc1bcf248631e750e14a2e9c90d6b /configure.ac
parentdd26c9f333b9681b3b14cf01969cda9d77368cbc (diff)
downloadruby-733aa2f8b578d03bbcb91d2f496b01e3b990c7e8.tar.gz
Stop setting same flags as cflags to cxxflags
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac12
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 2a71a91143..90b5a409e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,11 +162,11 @@ AS_IF([test -z "${CFLAGS+set}"], [
orig_cflags="$cflags"
cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
])
-AS_IF([test -z "${CXXFLAGS+set}"], [
- cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
- orig_cxxflags="$cxxflags"
- cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
-])
+dnl AS_IF([test -z "${CXXFLAGS+set}"], [
+dnl cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
+dnl orig_cxxflags="$cxxflags"
+dnl cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
+dnl ])
AS_CASE(["$host_os:$build_os"],
[darwin*:darwin*], [
@@ -3594,7 +3594,7 @@ rb_cv_warnflags=`echo "$rb_cv_warnflags" | sed 's/^ *//;s/ *$//'`
warnflags="$rb_cv_warnflags"
AC_SUBST(cppflags)dnl
AC_SUBST(cflags, ["${orig_cflags:+$orig_cflags }"'${optflags} ${debugflags} ${warnflags}'])dnl
-AC_SUBST(cxxflags, ["${orig_cxxflags:+$orig_cxxflags }"'${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(cxxflags)dnl
AC_SUBST(optflags)dnl
AC_SUBST(debugflags)dnl
AC_SUBST(warnflags)dnl