From 2763fc6f5a51d99639e10669f0a432d965d86d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Mart=C3=ADnez?= Date: Thu, 16 Jun 2011 16:42:15 +0200 Subject: [PATCH] Add clang compiler option Signed-off-by: Adam Vandenberg --- Library/Homebrew/cmd/--env.rb | 3 ++- Library/Homebrew/extend/ENV.rb | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/--env.rb b/Library/Homebrew/cmd/--env.rb index 2f6e421a0b..2a11d1e0b4 100644 --- a/Library/Homebrew/cmd/--env.rb +++ b/Library/Homebrew/cmd/--env.rb @@ -9,8 +9,9 @@ module Homebrew extend self end def dump_build_env env + puts %["--use-clang" was specified] if ARGV.include? '--use-clang' puts %["--use-llvm" was specified] if ARGV.include? '--use-llvm' - puts "\"--use-gcc\" was specified" if ARGV.include? '--use-gcc' + puts %["--use-gcc" was specified] if ARGV.include? '--use-gcc' %w[ CC CXX LD ].each do |k| value = env[k] diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 08e145cdc9..b9a45cc424 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -18,7 +18,11 @@ module HomebrewEnvExtension self['CMAKE_PREFIX_PATH'] = "#{HOMEBREW_PREFIX}" end - if MACOS_VERSION >= 10.6 and (self['HOMEBREW_USE_LLVM'] or ARGV.include? '--use-llvm') + if MACOS_VERSION >= 10.6 and ARGV.include? '--use-clang' + self['CC'] = "#{MacOS.xcode_prefix}/usr/bin/clang" + self['CXX'] = "#{MacOS.xcode_prefix}/usr/bin/clang++" + cflags = ['-O3'] # -O4 makes the linker fail on some formulae + elsif MACOS_VERSION >= 10.6 and (self['HOMEBREW_USE_LLVM'] or ARGV.include? '--use-llvm') self['CC'] = "#{MacOS.xcode_prefix}/usr/bin/llvm-gcc" self['CXX'] = "#{MacOS.xcode_prefix}/usr/bin/llvm-g++" cflags = ['-O4'] # link time optimisation baby!