Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip to set DESTDIR option when it's not provided for mswin platform #5049

Merged
merged 2 commits into from
Nov 4, 2021
Merged

Skip to set DESTDIR option when it's not provided for mswin platform #5049

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b93546c
Skip to set DESTDIR option when it's not provided for mswin platform
hsbt Nov 4, 2021
69dcc02
Explicitly ignored empty value for DESTDIR
hsbt Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/rubygems/ext/builder.rb
View file
Open in desktop
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