diff options
| author | Jack Nagel | 2012-02-21 00:17:19 -0600 |
|---|---|---|
| committer | Jack Nagel | 2012-02-21 00:22:27 -0600 |
| commit | 3709168a71ef4d581b6dfefdad2d33200576e2ee (patch) | |
| tree | d77f614e027939983d9a8f213786c0da6ad0bcab /Library | |
| parent | b1f5faea0a75a14a1b7f1a4547906185fe47cd8e (diff) | |
| download | homebrew-3709168a71ef4d581b6dfefdad2d33200576e2ee.tar.bz2 | |
Remove unused :force switches
The :force behavior for ENV.gcc has been the default for some time, and
was used to force vanilla gcc in case the gcc symlink pointed at
llvm-gcc; for ENV.clang, this doesn't mattera as clang is just clang.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/formula.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 146c25755..b71c0228e 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -126,7 +126,7 @@ module HomebrewEnvExtension ENV['CXX'] = `/usr/bin/xcrun -find #{$1}`.chomp if $1 end - def gcc args = {} + def gcc # Apple stopped shipping gcc-4.2 with Xcode 4.2 # However they still provide a gcc symlink to llvm # But we don't want LLVM of course. @@ -157,7 +157,7 @@ module HomebrewEnvExtension @compiler = :llvm end - def clang args = {} + def clang self['CC'] = xcrun "clang" self['CXX'] = xcrun "clang++" replace_in_cflags(/-Xarch_i386 (-march=\S*)/, '\1') diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index d6a80ddc1..453c1082f 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -256,10 +256,10 @@ class Formula if llvm.build.to_i >= 2336 if MacOS.xcode_version < "4.2" opoo "Formula will not build with LLVM, using GCC" - ENV.gcc :force => true + ENV.gcc else opoo "Formula will not build with LLVM, trying Clang" - ENV.clang :force => true + ENV.clang end return end |