diff options
Diffstat (limited to 'Library/Homebrew/development_tools.rb')
| -rw-r--r-- | Library/Homebrew/development_tools.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/development_tools.rb b/Library/Homebrew/development_tools.rb index 8f417b082..996dea87c 100644 --- a/Library/Homebrew/development_tools.rb +++ b/Library/Homebrew/development_tools.rb @@ -50,8 +50,8 @@ class DevelopmentTools def gcc_4_2_build_version @gcc_4_2_build_version ||= begin - gcc = locate("gcc-4.2") || HOMEBREW_PREFIX.join("opt/apple-gcc42/bin/gcc-4.2") - if gcc.exist? && !gcc.realpath.basename.to_s.start_with?("llvm")&& + gcc = locate("gcc-4.2") || HOMEBREW_PREFIX/"opt/apple-gcc42/bin/gcc-4.2" + if gcc.exist? && !gcc.realpath.basename.to_s.start_with?("llvm") && build_version = `#{gcc} --version 2>/dev/null`[/build (\d{4,})/, 1] Version.new build_version else @@ -96,7 +96,7 @@ class DevelopmentTools def non_apple_gcc_version(cc) (@non_apple_gcc_version ||= {}).fetch(cc) do - path = HOMEBREW_PREFIX.join("opt", "gcc", "bin", cc) + path = HOMEBREW_PREFIX/"opt/gcc/bin"/cc path = locate(cc) unless path.exist? version = if path && build_version = `#{path} --version`[/gcc(?:-\d(?:\.\d)? \(.+\))? (\d\.\d\.\d)/, 1] |