diff options
author | tarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-28 16:01:22 +0000 |
---|---|---|
committer | tarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-28 16:01:22 +0000 |
commit | 5f960a9ca26a3c4205aa9de7f0d961f0fe225935 (patch) | |
tree | 27eb6aef822262cc0f381748b592f17ebf6f9bd5 /test/rubygems/gemutilities.rb | |
parent | 5b5c6378c7758af3b264972250f715c054ed0a37 (diff) | |
download | ruby-5f960a9ca26a3c4205aa9de7f0d961f0fe225935.tar.gz |
* test/rubygems/gemutilities.rb: check ENV['make'] for make_command.
* test/rubygems/test_gem_ext_configure_builder.rb: use gemutilities' make_command.
* test/rubygems/test_gem_ext_ext_conf_builder.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/gemutilities.rb')
-rw-r--r-- | test/rubygems/gemutilities.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/rubygems/gemutilities.rb b/test/rubygems/gemutilities.rb index f1b0f75f51..803cd26c96 100644 --- a/test/rubygems/gemutilities.rb +++ b/test/rubygems/gemutilities.rb @@ -474,7 +474,7 @@ Also, a list: # other platforms, including Cygwin, it will return 'make'. # def self.make_command - vc_windows? ? 'nmake' : 'make' + ENV["make"] || (vc_windows? ? 'nmake' : 'make') end # Returns the make command for the current platform. For versions of Ruby @@ -482,7 +482,7 @@ Also, a list: # other platforms, including Cygwin, it will return 'make'. # def make_command - vc_windows? ? 'nmake' : 'make' + ENV["make"] || (vc_windows? ? 'nmake' : 'make') end # Returns whether or not the nmake command could be found. |