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

ruby-changes:69594

From: Hiroshi <ko1@a...>
Date: Fri, 5 Nov 2021 07:35:35 +0900 (JST)
Subject: [ruby-changes:69594] 16331d9abb (master): [rubygems/rubygems] Explicitly ignored empty value for DESTDIR

https://git.ruby-lang.org/ruby.git/commit/?id=16331d9abb

From 16331d9abb23aa2c3840d69a11e71881e8954b08 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Thu, 4 Nov 2021 14:10:59 +0900
Subject: [rubygems/rubygems] Explicitly ignored empty value for DESTDIR

https://github.com/rubygems/rubygems/commit/69dcc02553
---
 lib/rubygems/ext/builder.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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