[前][次][番号順一覧][スレッド一覧]

ruby-changes:38036

From: nobu <ko1@a...>
Date: Mon, 30 Mar 2015 09:51:15 +0900 (JST)
Subject: [ruby-changes:38036] nobu:r50117 (trunk): test_case.rb: $make before $MAKE

nobu	2015-03-30 09:50:47 +0900 (Mon, 30 Mar 2015)

  New Revision: 50117

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50117

  Log:
    test_case.rb: $make before $MAKE
    
    * lib/rubygems/test_case.rb (make_command): try unusual $make
      before usual $MAKE.

  Modified files:
    trunk/lib/rubygems/test_case.rb
Index: lib/rubygems/test_case.rb
===================================================================
--- lib/rubygems/test_case.rb	(revision 50116)
+++ lib/rubygems/test_case.rb	(revision 50117)
@@ -1108,7 +1108,7 @@ Also, a list: https://github.com/ruby/ruby/blob/trunk/lib/rubygems/test_case.rb#L1108
   # 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: https://github.com/ruby/ruby/blob/trunk/lib/rubygems/test_case.rb#L1117
   # 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
 
   ##

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]