Skip to content

Commit

Permalink
Merge pull request #5049 from rubygems/skip-destdir
Browse files Browse the repository at this point in the history
Skip to set DESTDIR option when it's not provided for mswin platform

(cherry picked from commit 2bd3f00)
  • Loading branch information
hsbt authored and deivid-rodriguez committed Nov 8, 2021
1 parent 37d6a60 commit f54c59e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/rubygems/ext/builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ def self.make(dest_path, results, make_dir = Dir.pwd)
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'] && ENV['DESTDIR'] != "") ? 'DESTDIR=%s' % ENV['DESTDIR'] : ''

['clean', '', 'install'].each do |target|
# Pass DESTDIR via command line to override what's in MAKEFLAGS
Expand Down

0 comments on commit f54c59e

Please sign in to comment.