aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-24 07:49:25 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-24 07:49:25 +0000
commit0ed74fa766fc9675ce59f74117ffd448290d2cfd (patch)
tree5f3aceb0c6f878aaa1129c0c22b84e70d4fa8da0
parentb9791748db9156f959a111f02ca6f9a229073056 (diff)
downloadruby-0ed74fa766fc9675ce59f74117ffd448290d2cfd.tar.gz
* configure.in (ruby_cflags): separate from optflags [Bug #12409]
-fexcess-precision=standard and -fp-model precise are set to this now. * configure.in (cflags): use ruby_cflags. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--configure.in8
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 09af6985db..d379853d31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue May 24 16:37:43 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * configure.in (ruby_cflags): separate from optflags [Bug #12409]
+ -fexcess-precision=standard and -fp-model precise are set to this now.
+
+ * configure.in (cflags): use ruby_cflags.
+
Tue May 24 16:20:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (ERRORFUNC, WARNINGFUNC): __error__ and __warning__
diff --git a/configure.in b/configure.in
index 3131b3011b..c4d18b746e 100644
--- a/configure.in
+++ b/configure.in
@@ -967,9 +967,12 @@ if test "$GCC" = yes; then
])
# disable fast-math
- for oflag in -fno-fast-math -fexcess-precision=standard -fp-model\ precise; do
+ for oflag in -fno-fast-math; do
RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
done
+ for oflag in -fexcess-precision=standard -fp-model\ precise; do
+ RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(ruby_cflags, $oflag)])
+ done
fi
AC_ARG_WITH(opt-dir,
@@ -4219,7 +4222,8 @@ if test "${ARCH_FLAG}"; then
fi
warnflags="$rb_cv_warnflags"
AC_SUBST(cppflags)dnl
-AC_SUBST(cflags, ["${orig_cflags:+$orig_cflags }"'${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(ruby_cflags)dnl
+AC_SUBST(cflags, ["${orig_cflags:+$orig_cflags }${ruby_cflags:+$ruby_cflags }"'${optflags} ${debugflags} ${warnflags}'])dnl
AC_SUBST(cxxflags, ["${orig_cxxflags:+$orig_cxxflags }"'${optflags} ${debugflags} ${warnflags}'])dnl
AC_SUBST(optflags)dnl
AC_SUBST(debugflags)dnl