diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-30 07:29:40 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-30 07:29:40 +0000 |
| commit | b25243775e755e8eb3680c6e583f51a55cd53ca9 (patch) | |
| tree | 7d220c2053c36404328c885ca9c86624ecb4a562 | |
| parent | 8c4052147f174b380b6ad5484cfd60e410ae0d29 (diff) | |
| download | ruby-b25243775e755e8eb3680c6e583f51a55cd53ca9.tar.gz | |
merge revision(s) 45365: [Backport #9656]
dl/extconf.rb: check for -fno-defer-pop option
* ext/dl/extconf.rb: check for -fno-defer-pop option, since clang
5.1 no longer support -fno-defer-pop option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/dl/extconf.rb | 7 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb index 4ef46f85fb..53e73c3a8b 100644 --- a/ext/dl/extconf.rb +++ b/ext/dl/extconf.rb @@ -1,7 +1,12 @@ require 'mkmf' if RbConfig::CONFIG['GCC'] == 'yes' - (have_macro("__clang__") ? $LDFLAGS : $CFLAGS) << " -fno-defer-pop" + flag = " -fno-defer-pop" + if have_macro("__clang__") + $LDFLAGS << flag if try_ldflags(flag) + else + $CFLAGS << flag + end $CFLAGS << " -fno-omit-frame-pointer" end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-04-30" -#define RUBY_PATCHLEVEL 471 +#define RUBY_PATCHLEVEL 472 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 4 |