mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Favor compound if over compound unless

Browse Source
This commit is contained in:
Jack Nagel 2013-06-14 10:13:55 -05:00
parent 9427704176
commit eee5a09202
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/extend/ENV.rb
View File

@ -189,7 +189,8 @@ module HomebrewEnvExtension
delete('MACOSX_DEPLOYMENT_TARGET') delete('MACOSX_DEPLOYMENT_TARGET')
delete('CPATH') delete('CPATH')
remove 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib" 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') delete('SDKROOT')
remove_from_cflags "-isysroot #{sdk}" remove_from_cflags "-isysroot #{sdk}"
remove 'CPPFLAGS', "-isysroot #{sdk}" remove 'CPPFLAGS', "-isysroot #{sdk}"
@ -213,7 +214,8 @@ module HomebrewEnvExtension
self['MACOSX_DEPLOYMENT_TARGET'] = version self['MACOSX_DEPLOYMENT_TARGET'] = version
self['CPATH'] = "#{HOMEBREW_PREFIX}/include" self['CPATH'] = "#{HOMEBREW_PREFIX}/include"
prepend 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib" 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. # Extra setup to support Xcode 4.3+ without CLT.
self['SDKROOT'] = sdk self['SDKROOT'] = sdk
# Tell clang/gcc where system include's are: # Tell clang/gcc where system include's are: