diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-17 00:10:54 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-17 00:10:54 +0000 |
| commit | 0955d9101c37013357ad622678962fb21d7436fa (patch) | |
| tree | b1e20449d2e30e378eb91574cf43a655a64ba6a2 /spec | |
| parent | 2b0c0cc2dbf45fb9ac96bf81c30f8b5bc1adb274 (diff) | |
capi/spec_helper.rb: use MAKE env
* spec/rubyspec/optional/capi/spec_helper.rb (compile_extension):
prefer MAKE environment variable to hardcoded name if set by
parent make.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/rubyspec/optional/capi/spec_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/rubyspec/optional/capi/spec_helper.rb b/spec/rubyspec/optional/capi/spec_helper.rb index c250253919..5dbe6bbcac 100644 --- a/spec/rubyspec/optional/capi/spec_helper.rb +++ b/spec/rubyspec/optional/capi/spec_helper.rb @@ -55,7 +55,8 @@ def compile_extension(name) $stderr.puts output if debug end - make = RbConfig::CONFIG['host_os'].include?("mswin") ? "nmake" : "make" + make = ENV['MAKE'] + make ||= (RbConfig::CONFIG['host_os'].include?("mswin") ? "nmake" : "make") ENV.delete "MAKEFLAGS" # Fix make warning when invoked with -j in MRI # Do not capture stderr as we want to show compiler warnings |