admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

FileUtils.make: don't bypass superenv

Browse Source
This commit is contained in:
Misty De Meo 2017-07-07 15:50:01 -07:00
parent 30adcab6cf
commit 890788af65
No known key found for this signature in database
GPG Key ID: 76CF846A2F674B2C
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/extend/fileutils.rb
View File

@ -111,10 +111,18 @@ module FileUtils
# path to the actually-installed make on Tiger or older. # path to the actually-installed make on Tiger or older.
def make(*args) def make(*args)
if Utils.popen_read("/usr/bin/make", "--version").match(/Make (\d\.\d+)/)[1] > "3.80" if Utils.popen_read("/usr/bin/make", "--version").match(/Make (\d\.\d+)/)[1] > "3.80"
system "/usr/bin/make", *args make_path = "/usr/bin/make"
else else
make = Formula["make"].opt_bin/"make" make = Formula["make"].opt_bin/"make"
make_path = make.exist? ? make.to_s : (Formula["make"].opt_bin/"gmake").to_s make_path = make.exist? ? make.to_s : (Formula["make"].opt_bin/"gmake").to_s
end
if superenv?
make_name = File.basename(make_path)
with_env "HOMEBREW_MAKE" => make_name do
system "make", *args
end
else
system make_path, *args system make_path, *args
end end
end end

3
Library/Homebrew/shims/super/make
View File

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
export MAKE=${HOMEBREW_MAKE:-make}
export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG" export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
exec xcrun make "$@" exec xcrun $MAKE "$@"