aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/build.rb
diff options
context:
space:
mode:
authorJack Nagel2014-03-13 16:36:51 -0500
committerJack Nagel2014-03-13 16:37:11 -0500
commitd19e96c7a585060346e3a57b8600cec5511455e5 (patch)
tree7d0f8e6668f3ba2137d1fba36e59a2aedce4c1b9 /Library/Homebrew/build.rb
parente3c3dbd9a61c957e70b312fb83f028c6437108a3 (diff)
downloadhomebrew-d19e96c7a585060346e3a57b8600cec5511455e5.tar.bz2
Use ARGV.env
Diffstat (limited to 'Library/Homebrew/build.rb')
-rwxr-xr-xLibrary/Homebrew/build.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb
index 985d0bae4..6e873bcb5 100755
--- a/Library/Homebrew/build.rb
+++ b/Library/Homebrew/build.rb
@@ -81,8 +81,9 @@ class Build
def pre_superenv_hacks
# Allow a formula to opt-in to the std environment.
- ARGV.unshift '--env=std' if (f.env.std? or deps.any? { |d| d.name == 'scons' }) and
- not ARGV.include? '--env=super'
+ if (f.env.std? || deps.any? { |d| d.name == "scons" }) && ARGV.env != "super"
+ ARGV.unshift "--env=std"
+ end
end
def expand_reqs