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

Delete rather than assign nil

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

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

@ -186,17 +186,17 @@ module HomebrewEnvExtension
# previously added by macosxsdk # previously added by macosxsdk
v = v.to_s v = v.to_s
remove_from_cflags(/ ?-mmacosx-version-min=10\.\d/) remove_from_cflags(/ ?-mmacosx-version-min=10\.\d/)
self['MACOSX_DEPLOYMENT_TARGET'] = nil delete('MACOSX_DEPLOYMENT_TARGET')
self['CPATH'] = nil delete('CPATH')
remove 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib" remove 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib"
sdk = MacOS.sdk_path(v) sdk = MacOS.sdk_path(v)
unless sdk.nil? or MacOS::CLT.installed? unless sdk.nil? or MacOS::CLT.installed?
self['SDKROOT'] = nil delete('SDKROOT')
remove_from_cflags "-isysroot #{sdk}" remove_from_cflags "-isysroot #{sdk}"
remove 'CPPFLAGS', "-isysroot #{sdk}" remove 'CPPFLAGS', "-isysroot #{sdk}"
remove 'LDFLAGS', "-isysroot #{sdk}" remove 'LDFLAGS', "-isysroot #{sdk}"
if HOMEBREW_PREFIX.to_s == '/usr/local' if HOMEBREW_PREFIX.to_s == '/usr/local'
self['CMAKE_PREFIX_PATH'] = nil delete('CMAKE_PREFIX_PATH')
else else
# It was set in setup_build_environment, so we have to restore it here. # It was set in setup_build_environment, so we have to restore it here.
self['CMAKE_PREFIX_PATH'] = "#{HOMEBREW_PREFIX}" self['CMAKE_PREFIX_PATH'] = "#{HOMEBREW_PREFIX}"