Merge pull request #2877 from mistydemeo/fix_fileutils_make

FileUtils.make: don't bypass superenv

2 files changed, 9 insertions, 2 deletions

diff --git a/Library/Homebrew/extend/fileutils.rb b/Library/Homebrew/extend/fileutils.rb
index 287a1408f..fea5b5464 100644
--- a/Library/Homebrew/extend/fileutils.rb
+++ b/Library/Homebrew/extend/fileutils.rb
@@ -111,10 +111,16 @@ 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"
-      system "/usr/bin/make", *args
+      make_path = "/usr/bin/make"
     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 028e3462a..4a7139fa2 100755
--- a/Library/Homebrew/shims/super/make
+++ b/Library/Homebrew/shims/super/make
@@ -1,4 +1,5 @@
 #!/bin/bash
 
+export MAKE=${MAKE:-make}
 export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
-exec xcrun make "$@"
+exec xcrun $MAKE "$@"