mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
2b0c0cc2db
commit
0955d9101c
1 changed files with 2 additions and 1 deletions
|
@ -55,7 +55,8 @@ def compile_extension(name)
|
||||||
$stderr.puts output if debug
|
$stderr.puts output if debug
|
||||||
end
|
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
|
ENV.delete "MAKEFLAGS" # Fix make warning when invoked with -j in MRI
|
||||||
|
|
||||||
# Do not capture stderr as we want to show compiler warnings
|
# Do not capture stderr as we want to show compiler warnings
|
||||||
|
|
Loading…
Reference in a new issue