diff options
| author | ilovezfs | 2017-07-12 02:58:01 -0700 |
|---|---|---|
| committer | GitHub | 2017-07-12 02:58:01 -0700 |
| commit | 0d03eef655bdd7520aa9416d58ecfedbb656fa1e (patch) | |
| tree | 00f5d06c0726b83ef538956748cb3ee22855fe08 | |
| parent | c6290ed45913338160fa5acb84a423612b886960 (diff) | |
| download | brew-0d03eef655bdd7520aa9416d58ecfedbb656fa1e.tar.bz2 | |
Revert "FileUtils.make: don't bypass superenv"
| -rw-r--r-- | Library/Homebrew/extend/fileutils.rb | 8 | ||||
| -rwxr-xr-x | Library/Homebrew/shims/super/make | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/Library/Homebrew/extend/fileutils.rb b/Library/Homebrew/extend/fileutils.rb index fea5b5464..287a1408f 100644 --- a/Library/Homebrew/extend/fileutils.rb +++ b/Library/Homebrew/extend/fileutils.rb @@ -111,16 +111,10 @@ module FileUtils # path to the actually-installed make on Tiger or older. def make(*args) if Utils.popen_read("/usr/bin/make", "--version").match(/Make (\d\.\d+)/)[1] > "3.80" - make_path = "/usr/bin/make" + system "/usr/bin/make", *args else make = Formula["make"].opt_bin/"make" make_path = make.exist? ? make.to_s : (Formula["make"].opt_bin/"gmake").to_s - end - - if superenv? - make_name = File.basename(make_path) - system({ "MAKE" => make_name }, "make", *args) - else system make_path, *args end end diff --git a/Library/Homebrew/shims/super/make b/Library/Homebrew/shims/super/make index 4a7139fa2..028e3462a 100755 --- a/Library/Homebrew/shims/super/make +++ b/Library/Homebrew/shims/super/make @@ -1,5 +1,4 @@ #!/bin/bash -export MAKE=${MAKE:-make} export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG" -exec xcrun $MAKE "$@" +exec xcrun make "$@" |