* 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
This commit is contained in:
nobu 2017-09-08 08:03:18 +00:00
Родитель b3907bb5dc
Коммит f2e04b77aa
2 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -1024,7 +1024,7 @@ AS_IF([test "$GCC" = yes], [
test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])} test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])}
]) ])
test $ac_cv_prog_cc_g = yes && : ${debugflags=-g} 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_IF([test "$GCC" = ""], [
AS_CASE(["$target_os"],[aix*],[warnflags="$warnflags -qinfo=por" rb_cv_warnflags="$rb_cv_warnflags -qinfo=por"]) 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 # disable fast-math
for oflag in -fno-fast-math; do 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 done
for oflag in -fexcess-precision=standard -fp-model\ precise; do for oflag in -fexcess-precision=standard -fp-model\ precise; do
RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(XCFLAGS, $oflag)]) RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(XCFLAGS, $oflag)])

Просмотреть файл

@ -114,7 +114,7 @@ ARCH = $(MACHINE)
DEBUGFLAGS = -Zi DEBUGFLAGS = -Zi
!endif !endif
!if "$(RUBY_DEVEL)" == "yes" !if "$(RUBY_DEVEL)" == "yes"
DEBUGFLAGS = $(DEBUGFLAGS) -DRUBY_DEVEL=1 XCFLAGS = $(XCFLAGS) -DRUBY_DEVEL=1
!endif !endif
!if !defined(OPTFLAGS) !if !defined(OPTFLAGS)
!if $(MSC_VER) < 1400 !if $(MSC_VER) < 1400