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

ruby-changes:69615

From: Hiroshi <ko1@a...>
Date: Sat, 6 Nov 2021 09:07:07 +0900 (JST)
Subject: [ruby-changes:69615] 666a918595 (master): [rubygems/rubygems] GNU Make needs DESTDIR on Windows environment like msys or mingw

https://git.ruby-lang.org/ruby.git/commit/?id=666a918595

From 666a9185953e84e861688ed5ea6f2ac71c4ace32 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Sat, 6 Nov 2021 07:22:35 +0900
Subject: [rubygems/rubygems] GNU Make needs DESTDIR on Windows environment
 like msys or mingw

https://github.com/rubygems/rubygems/commit/7fd987d30d
---
 lib/rubygems/ext/builder.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb
index b70be22dc03..6d32be6515b 100644
--- a/lib/rubygems/ext/builder.rb
+++ b/lib/rubygems/ext/builder.rb
@@ -24,14 +24,14 @@ class Gem::Ext::Builder https://github.com/ruby/ruby/blob/trunk/lib/rubygems/ext/builder.rb#L24
 
     # try to find make program from Ruby configure arguments first
     RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
-    make_program = ENV['MAKE'] || ENV['make'] || $1
-    unless make_program
-      make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
+    make_program_name = ENV['MAKE'] || ENV['make'] || $1
+    unless make_program_name
+      make_program_name = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
     end
-    make_program = Shellwords.split(make_program)
+    make_program = Shellwords.split(make_program_name)
 
     # The installation of the bundled gems is failed when DESTDIR is empty in mswin platform.
-    destdir = (ENV['DESTDIR'] && ENV['DESTDIR'] != "") ? 'DESTDIR=%s' % ENV['DESTDIR'] : ''
+    destdir = (/\bnmake/i !~ make_program_name || ENV['DESTDIR'] && ENV['DESTDIR'] != "") ? 'DESTDIR=%s' % ENV['DESTDIR'] : ''
 
     ['clean', '', 'install'].each do |target|
       # Pass DESTDIR via command line to override what's in MAKEFLAGS
-- 
cgit v1.2.1


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

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