From 0d03eef655bdd7520aa9416d58ecfedbb656fa1e Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Wed, 12 Jul 2017 02:58:01 -0700 Subject: Revert "FileUtils.make: don't bypass superenv" --- Library/Homebrew/extend/fileutils.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Library/Homebrew/extend') 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 -- cgit v1.2.3