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

ruby-changes:46990

From: nobu <ko1@a...>
Date: Sat, 17 Jun 2017 09:11:00 +0900 (JST)
Subject: [ruby-changes:46990] nobu:r59105 (trunk): capi/spec_helper.rb: use MAKE env

nobu	2017-06-17 09:10:54 +0900 (Sat, 17 Jun 2017)

  New Revision: 59105

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

  Log:
    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.

  Modified files:
    trunk/spec/rubyspec/optional/capi/spec_helper.rb
Index: spec/rubyspec/optional/capi/spec_helper.rb
===================================================================
--- spec/rubyspec/optional/capi/spec_helper.rb	(revision 59104)
+++ spec/rubyspec/optional/capi/spec_helper.rb	(revision 59105)
@@ -55,7 +55,8 @@ def compile_extension(name) https://github.com/ruby/ruby/blob/trunk/spec/rubyspec/optional/capi/spec_helper.rb#L55
         $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

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

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