diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-11-06 07:22:35 +0900 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2021-11-06 09:06:49 +0900 |
| commit | 666a9185953e84e861688ed5ea6f2ac71c4ace32 (patch) | |
| tree | b3aa637dc3814faa069dfece4fe65d044264d7bf | |
| parent | fbd6cc5856d10f935dd8aea96826652dbb49d844 (diff) | |
[rubygems/rubygems] GNU Make needs DESTDIR on Windows environment like msys or mingw
https://github.com/rubygems/rubygems/commit/7fd987d30d
| -rw-r--r-- | lib/rubygems/ext/builder.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb index b70be22dc0..6d32be6515 100644 --- a/lib/rubygems/ext/builder.rb +++ b/lib/rubygems/ext/builder.rb @@ -24,14 +24,14 @@ class Gem::Ext::Builder # 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 |