diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-12 08:10:36 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-12 08:10:36 +0000 |
commit | 57146168af9266a29dfd7bde43b65d29fab81764 (patch) | |
tree | 6b6043259b7a7f5b1799844c81a244456854a165 | |
parent | f2cf6a2b10d697d8104f2f3623a12d65ccdb1917 (diff) | |
download | ruby-57146168af9266a29dfd7bde43b65d29fab81764.tar.gz |
remove code old versions
* spec/rubyspec/optional/capi/spec_helper.rb (compile_extension):
remove code old versions. `RbConfig::CONFIG["rubyhdrdir"]` is
since 1.9, and `RbConfig::CONFIG["rubyarchhdrdir"]` is since
2.0.0.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | spec/rubyspec/optional/capi/spec_helper.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/spec/rubyspec/optional/capi/spec_helper.rb b/spec/rubyspec/optional/capi/spec_helper.rb index e60016f4a7..ca0685c9fe 100644 --- a/spec/rubyspec/optional/capi/spec_helper.rb +++ b/spec/rubyspec/optional/capi/spec_helper.rb @@ -29,12 +29,8 @@ def compile_extension(name) if RUBY_NAME == 'rbx' hdrdir = RbConfig::CONFIG["rubyhdrdir"] elsif RUBY_NAME =~ /^ruby/ - if hdrdir = RbConfig::CONFIG["rubyhdrdir"] - arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"] || - File.join(hdrdir, RbConfig::CONFIG["arch"]) - else - hdrdir = RbConfig::CONFIG["archdir"] - end + hdrdir = RbConfig::CONFIG["rubyhdrdir"] + arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"] elsif RUBY_NAME == 'jruby' require 'mkmf' hdrdir = $hdrdir |