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

Use MacOS.xcode_prefix

Browse Source
This commit is contained in:
Adam Vandenberg 2011-03-28 11:14:22 -07:00
parent 8f7972c194
commit 89720e1d20
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,15 +18,13 @@ module HomebrewEnvExtension
self['CMAKE_PREFIX_PATH'] = "#{HOMEBREW_PREFIX}" self['CMAKE_PREFIX_PATH'] = "#{HOMEBREW_PREFIX}"
end end
xcode_path = `/usr/bin/xcode-select -print-path`.chomp
xcode_path = "/Developer" if xcode_path.to_s.empty?
if MACOS_VERSION >= 10.6 and (self['HOMEBREW_USE_LLVM'] or ARGV.include? '--use-llvm') if MACOS_VERSION >= 10.6 and (self['HOMEBREW_USE_LLVM'] or ARGV.include? '--use-llvm')
self['CC'] = "#{xcode_path}/usr/bin/llvm-gcc" self['CC'] = "#{MacOS.xcode_prefix}/usr/bin/llvm-gcc"
self['CXX'] = "#{xcode_path}/usr/bin/llvm-g++" self['CXX'] = "#{MacOS.xcode_prefix}/usr/bin/llvm-g++"
cflags = ['-O4'] # link time optimisation baby! cflags = ['-O4'] # link time optimisation baby!
elsif MACOS_VERSION >= 10.6 and (self['HOMEBREW_USE_GCC'] or ARGV.include? '--use-gcc') elsif MACOS_VERSION >= 10.6 and (self['HOMEBREW_USE_GCC'] or ARGV.include? '--use-gcc')
self['CC'] = "#{xcode_path}/usr/bin/gcc" self['CC'] = "#{MacOS.xcode_prefix}/usr/bin/gcc"
self['CXX'] = "#{xcode_path}/usr/bin/g++" self['CXX'] = "#{MacOS.xcode_prefix}/usr/bin/g++"
cflags = ['-O3'] cflags = ['-O3']
else else
# If these aren't set, many formulae fail to build # If these aren't set, many formulae fail to build