diff options
| author | Jack Nagel | 2013-06-14 10:13:55 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-06-14 10:34:20 -0500 |
| commit | eee5a0920297dafaeb51007add4be2052c31d4db (patch) | |
| tree | b1cbab6e0bf32763c024ff303ab7938e0fe104d7 /Library | |
| parent | 9427704176f3c877484fa3d66b2b272455b4225f (diff) | |
| download | brew-eee5a0920297dafaeb51007add4be2052c31d4db.tar.bz2 | |
Favor compound if over compound unless
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 4323b829f..77ed6b8d0 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -189,7 +189,8 @@ module HomebrewEnvExtension delete('MACOSX_DEPLOYMENT_TARGET') delete('CPATH') remove 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib" - unless (sdk = MacOS.sdk_path(version)).nil? or MacOS::CLT.installed? + + if (sdk = MacOS.sdk_path(version)) && !MacOS::CLT.installed? delete('SDKROOT') remove_from_cflags "-isysroot #{sdk}" remove 'CPPFLAGS', "-isysroot #{sdk}" @@ -213,7 +214,8 @@ module HomebrewEnvExtension self['MACOSX_DEPLOYMENT_TARGET'] = version self['CPATH'] = "#{HOMEBREW_PREFIX}/include" prepend 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib" - unless (sdk = MacOS.sdk_path(version)).nil? or MacOS::CLT.installed? + + if (sdk = MacOS.sdk_path(version)) && !MacOS::CLT.installed? # Extra setup to support Xcode 4.3+ without CLT. self['SDKROOT'] = sdk # Tell clang/gcc where system include's are: |