admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Assign this inline

Browse Source
This commit is contained in:
Jack Nagel 2013-06-13 18:45:44 -05:00
parent 3252f9a2c9
commit 381255adec
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,16 +181,15 @@ module HomebrewEnvExtension
@compiler = :clang @compiler = :clang
end end
def remove_macosxsdk v=MacOS.version def remove_macosxsdk version=MacOS.version
# Clear all lib and include dirs from CFLAGS, CPPFLAGS, LDFLAGS that were # Clear all lib and include dirs from CFLAGS, CPPFLAGS, LDFLAGS that were
# previously added by macosxsdk # previously added by macosxsdk
v = v.to_s version = version.to_s
remove_from_cflags(/ ?-mmacosx-version-min=10\.\d/) remove_from_cflags(/ ?-mmacosx-version-min=10\.\d/)
delete('MACOSX_DEPLOYMENT_TARGET') delete('MACOSX_DEPLOYMENT_TARGET')
delete('CPATH') delete('CPATH')
remove 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib" remove 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib"
sdk = MacOS.sdk_path(v) unless (sdk = MacOS.sdk_path(version)).nil? or MacOS::CLT.installed?
unless sdk.nil? or 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}"
@ -205,18 +204,16 @@ module HomebrewEnvExtension
end end
end end
def macosxsdk v=MacOS.version def macosxsdk version=MacOS.version
return unless MACOS return unless MACOS
# Sets all needed lib and include dirs to CFLAGS, CPPFLAGS, LDFLAGS. # Sets all needed lib and include dirs to CFLAGS, CPPFLAGS, LDFLAGS.
remove_macosxsdk remove_macosxsdk
# Allow cool style of ENV.macosxsdk 10.8 here (no "" :) version = version.to_s
v = v.to_s append_to_cflags("-mmacosx-version-min=#{version}")
append_to_cflags("-mmacosx-version-min=#{v}") self['MACOSX_DEPLOYMENT_TARGET'] = version
self['MACOSX_DEPLOYMENT_TARGET'] = v
self['CPATH'] = "#{HOMEBREW_PREFIX}/include" self['CPATH'] = "#{HOMEBREW_PREFIX}/include"
prepend 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib" prepend 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib"
sdk = MacOS.sdk_path(v) unless (sdk = MacOS.sdk_path(version)).nil? or MacOS::CLT.installed?
unless sdk.nil? or 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: