summaryrefslogtreecommitdiff
path: root/lib/rubygems/test_case.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-30 00:50:47 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-30 00:50:47 +0000
commitbe6ef3502e5cbcad2f93bcef07a23a290499fd28 (patch)
tree254e178b03884c34da771c7bfd3fbe0900f57afc /lib/rubygems/test_case.rb
parent144484f213018d833c90ca08472a4042bba9d69a (diff)
test_case.rb: $make before $MAKE
* lib/rubygems/test_case.rb (make_command): try unusual $make before usual $MAKE. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/test_case.rb')
-rw-r--r--lib/rubygems/test_case.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
index fb8cf13..fa4b124 100644
--- a/lib/rubygems/test_case.rb
+++ b/lib/rubygems/test_case.rb
@@ -1108,7 +1108,7 @@ Also, a list:
# other platforms, including Cygwin, it will return 'make'.
def self.make_command
- ENV["MAKE"] || (vc_windows? ? 'nmake' : 'make')
+ ENV["make"] || ENV["MAKE"] || (vc_windows? ? 'nmake' : 'make')
end
##
@@ -1117,7 +1117,7 @@ Also, a list:
# other platforms, including Cygwin, it will return 'make'.
def make_command
- ENV["MAKE"] || (vc_windows? ? 'nmake' : 'make')
+ ENV["make"] || ENV["MAKE"] || (vc_windows? ? 'nmake' : 'make')
end
##