Merge RubyGems 3.2.6 and Bundler 2.2.6 (#4103)

This commit is contained in:
Hiroshi SHIBATA 2021-01-21 14:35:56 +09:00 committed by GitHub
parent 41d0c70812
commit 151e469a62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 236 additions and 51 deletions

View file

@ -28,13 +28,14 @@ class Gem::Ext::Builder
unless make_program
make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
end
make_program = Shellwords.split(make_program)
destdir = 'DESTDIR=%s' % ENV['DESTDIR']
['clean', '', 'install'].each do |target|
# Pass DESTDIR via command line to override what's in MAKEFLAGS
cmd = [
make_program,
*make_program,
destdir,
target,
].reject(&:empty?)