From f295661ca65e8c1baa8dd91f38a14e6b3d18e101 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 21 Feb 2012 00:17:19 -0600 Subject: [PATCH] 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 --- Library/Homebrew/extend/ENV.rb | 4 ++-- 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 146c25755d..b71c0228e1 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 d6a80ddc1e..453c1082f8 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