diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-24 15:21:53 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-24 15:21:53 +0000 |
| commit | b1d28feffb052ccbf34a018a0790ca7f37b36ee7 (patch) | |
| tree | 77958fc4001a9a9b90853a5604734fed5d806541 | |
| parent | b2bc7f3c868997b768541cfd59160a4f78ccfe19 (diff) | |
configure.in: merge ruby_cflags to XCFLAGS
* configure.in (XCFLAGS): merge flags only for ruby itself from
ruby_cflags.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed May 25 00:21:52 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (XCFLAGS): merge flags only for ruby itself from + ruby_cflags. + Tue May 24 22:04:15 2016 Kazuki Yamaguchi <k@rhe.jp> * ext/openssl/ossl_cipher.c (ossl_cipher_set_key, ossl_cipher_set_iv): diff --git a/configure.in b/configure.in index c4d18b746e..edddb540e8 100644 --- a/configure.in +++ b/configure.in @@ -971,7 +971,7 @@ if test "$GCC" = yes; then 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)]) + RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(XCFLAGS, $oflag)]) done fi @@ -4222,8 +4222,7 @@ if test "${ARCH_FLAG}"; then fi warnflags="$rb_cv_warnflags" AC_SUBST(cppflags)dnl -AC_SUBST(ruby_cflags)dnl -AC_SUBST(cflags, ["${orig_cflags:+$orig_cflags }${ruby_cflags:+$ruby_cflags }"'${optflags} ${debugflags} ${warnflags}'])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(optflags)dnl AC_SUBST(debugflags)dnl |