diff options
Diffstat (limited to 'Library/Homebrew/extend/ENV.rb')
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 41ac3e5d6..13900685c 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -10,7 +10,7 @@ module HomebrewEnvExtension remove_cc_etc # make any aclocal stuff installed in Homebrew available - self['ACLOCAL_PATH'] = "#{HOMEBREW_PREFIX}/share/aclocal" if MacOS.xcode_version < "4.3" + self['ACLOCAL_PATH'] = "#{HOMEBREW_PREFIX}/share/aclocal" if MacOS::Xcode.version < "4.3" self['MAKEFLAGS'] = "-j#{self.make_jobs}" @@ -47,7 +47,7 @@ module HomebrewEnvExtension macosxsdk MacOS.version # For Xcode 4.3 (*without* the "Command Line Tools for Xcode") compiler and tools inside of Xcode: - if not MacOS.clt_installed? and MacOS.xcode_installed? and MacOS.xcode_version >= "4.3" + if not MacOS::CLT.installed? and MacOS::Xcode.installed? and MacOS::Xcode.version >= "4.3" # Some tools (clang, etc.) are in the xctoolchain dir of Xcode append 'PATH', "#{MacOS.xctoolchain_path}/usr/bin", ":" if MacOS.xctoolchain_path # Others are now at /Applications/Xcode.app/Contents/Developer/usr/bin @@ -231,7 +231,7 @@ Please take one of the following actions: remove 'CPPFLAGS', "-isystem #{HOMEBREW_PREFIX}/include" remove 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib" sdk = MacOS.sdk_path(v) - unless sdk.nil? or MacOS.clt_installed? + unless sdk.nil? or MacOS::CLT.installed? self['SDKROOT'] = nil remove 'CPPFLAGS', "-isysroot #{sdk}" remove 'CPPFLAGS', "-isystem #{sdk}/usr/include" @@ -261,7 +261,7 @@ Please take one of the following actions: append 'CPPFLAGS', "-isystem #{HOMEBREW_PREFIX}/include" prepend 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib" sdk = MacOS.sdk_path(v) - unless sdk.nil? or MacOS.clt_installed? + unless sdk.nil? or MacOS::CLT.installed? # Extra setup to support Xcode 4.3+ without CLT. self['SDKROOT'] = sdk # Teach the preprocessor and compiler (some don't respect CPPFLAGS) @@ -286,16 +286,16 @@ Please take one of the following actions: def minimal_optimization self['CFLAGS'] = self['CXXFLAGS'] = "-Os #{SAFE_CFLAGS_FLAGS}" - macosxsdk unless MacOS.clt_installed? + macosxsdk unless MacOS::CLT.installed? end def no_optimization self['CFLAGS'] = self['CXXFLAGS'] = SAFE_CFLAGS_FLAGS - macosxsdk unless MacOS.clt_installed? + macosxsdk unless MacOS::CLT.installed? end # Some configure scripts won't find libxml2 without help def libxml2 - if MacOS.clt_installed? + if MacOS::CLT.installed? append 'CPPFLAGS', '-I/usr/include/libxml2' else # Use the includes form the sdk @@ -319,7 +319,7 @@ Please take one of the following actions: # We prefer XQuartz if it is installed. Otherwise, we look for Apple's # X11. For Xcode-only systems, the headers are found in the SDK. - prefix = if MacOS.x11_prefix.to_s == '/opt/X11' or MacOS.clt_installed? + prefix = if MacOS.x11_prefix.to_s == '/opt/X11' or MacOS::CLT.installed? MacOS.x11_prefix else MacOS.sdk_path/'usr/X11' @@ -330,7 +330,7 @@ Please take one of the following actions: append 'CMAKE_PREFIX_PATH', prefix, ':' append 'CMAKE_INCLUDE_PATH', prefix/'include', ':' - unless MacOS.clt_installed? + unless MacOS::CLT.installed? append 'CPPFLAGS', "-I#{prefix}/include/freetype2" append 'CFLAGS', "-I#{prefix}/include" end |