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

ruby-changes:69593

From: Hiroshi <ko1@a...>
Date: Fri, 5 Nov 2021 07:35:35 +0900 (JST)
Subject: [ruby-changes:69593] 33d01b7344 (master): [rubygems/rubygems] Skip to set DESTDIR option when it's not provided for mswin platform

https://git.ruby-lang.org/ruby.git/commit/?id=33d01b7344

From 33d01b73442ba2e434122077ce6ffdc419d21940 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Thu, 4 Nov 2021 13:59:41 +0900
Subject: [rubygems/rubygems] Skip to set DESTDIR option when it's not provided
 for mswin platform

https://github.com/rubygems/rubygems/commit/b93546c8d8
---
 lib/rubygems/ext/builder.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb
index 7934309901c..93c325328a9 100644
--- a/lib/rubygems/ext/builder.rb
+++ b/lib/rubygems/ext/builder.rb
@@ -30,7 +30,8 @@ class Gem::Ext::Builder https://github.com/ruby/ruby/blob/trunk/lib/rubygems/ext/builder.rb#L30
     end
     make_program = Shellwords.split(make_program)
 
-    destdir = 'DESTDIR=%s' % ENV['DESTDIR']
+    # The installation of the bundled gems is failed when DESTDIR is empty in mswin platform.
+    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/

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