aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-08 08:03:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-08 08:03:18 +0000
commit398df4b4265b2f0406406ba064e3ecaae33b684c (patch)
tree34c773a0278bafe1447f45f13b8c1c19db8f0946
parent797badf640a5af7b074d8fb3731ee4e3cce0691f (diff)
downloadruby-398df4b4265b2f0406406ba064e3ecaae33b684c.tar.gz
configure.in: moved flags
* configure.in (-DRUBY_DEVEL): moved from debugflags to XCFLAGS. this flags should be applied to the ruby core only. * configure.in (-fno-fast-math): moved from optflags to CFLAGS. this flag is not for optimization. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--configure.in4
-rw-r--r--win32/Makefile.sub2
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 08e109317f..8bad2b7977 100644
--- a/configure.in
+++ b/configure.in
@@ -1024,7 +1024,7 @@ AS_IF([test "$GCC" = yes], [
test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])}
])
test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
-AS_IF([test "x$RUBY_DEVEL" = xyes], [debugflags="$debugflags -DRUBY_DEVEL=1"])
+AS_IF([test "x$RUBY_DEVEL" = xyes], [RUBY_APPEND_OPTION(XCFLAGS, -DRUBY_DEVEL=1)])
AS_IF([test "$GCC" = ""], [
AS_CASE(["$target_os"],[aix*],[warnflags="$warnflags -qinfo=por" rb_cv_warnflags="$rb_cv_warnflags -qinfo=por"])
@@ -1057,7 +1057,7 @@ AS_IF([test "$GCC" = yes], [
# disable fast-math
for oflag in -fno-fast-math; do
- RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
+ RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(CFLAGS, $oflag)])
done
for oflag in -fexcess-precision=standard -fp-model\ precise; do
RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(XCFLAGS, $oflag)])
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index ed89832f0e..3a9e54460c 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -114,7 +114,7 @@ ARCH = $(MACHINE)
DEBUGFLAGS = -Zi
!endif
!if "$(RUBY_DEVEL)" == "yes"
-DEBUGFLAGS = $(DEBUGFLAGS) -DRUBY_DEVEL=1
+XCFLAGS = $(XCFLAGS) -DRUBY_DEVEL=1
!endif
!if !defined(OPTFLAGS)
!if $(MSC_VER) < 1400