diff options
| author | Misty De Meo | 2013-03-13 10:00:07 -0500 |
|---|---|---|
| committer | Misty De Meo | 2013-03-20 10:52:51 -0500 |
| commit | 621857282467afa9f2f6dc4e3e86e88a17e07710 (patch) | |
| tree | e158590c022c2a66a2ecffd65e2c143dcebc5957 | |
| parent | 8a523b821c3de497a786770a5b2b858234b1df61 (diff) | |
| download | homebrew-621857282467afa9f2f6dc4e3e86e88a17e07710.tar.bz2 | |
superenv: move check logic into superenv?
Fixes #16292.
| -rw-r--r-- | Library/Homebrew/superenv.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb index b79bba914..993a51b1e 100644 --- a/Library/Homebrew/superenv.rb +++ b/Library/Homebrew/superenv.rb @@ -17,6 +17,8 @@ def superbin end def superenv? + not (MacSystem.xcode43_without_clt? and + MacOS.sdk_path.nil?) and # because superenv will fail to find stuff not MacOS::Xcode.folder.nil? and # because xcrun won't work superbin and superbin.directory? and not ARGV.include? "--env=std" @@ -40,7 +42,6 @@ class << ENV def setup_build_environment reset - check ENV['CC'] = 'cc' ENV['CXX'] = 'c++' ENV['OBJC'] = 'cc' @@ -61,10 +62,6 @@ class << ENV ENV['ACLOCAL_PATH'] = determine_aclocal_path end - def check - raise if MacSystem.xcode43_without_clt? and MacOS.sdk_path.nil? - end - def universal_binary append 'HOMEBREW_CCCFG', "u", '' end |
