Skip to content

Commit ef806a8

Browse files
committed
Revert "if MAKE or make are in the environment, use those instead of rbconfig's"
This reverts commit afa63ed which is a new feature, not a bug fix.
1 parent b21751a commit ef806a8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/rubygems/ext/builder.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def self.make(dest_path, results)
1818

1919
# try to find make program from Ruby configure arguments first
2020
RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
21-
make_program = ENV['MAKE'] || ENV['make'] || $1
21+
make_program = $1 || ENV['MAKE'] || ENV['make']
2222
unless make_program then
2323
make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
2424
end

0 commit comments

Comments
 (0)