aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
authorMike McQuaid2014-05-05 13:44:42 +0100
committerMike McQuaid2014-05-06 16:45:50 +0100
commit2fb6d2fdbed66439de458932b89edb9222dc2ac1 (patch)
tree69253314394d0e57e189cdccacdee7d30da096f9 /Library/Homebrew/extend
parentc92a16e2ce4def0f019dde601c04721d21d3bad8 (diff)
downloadbrew-2fb6d2fdbed66439de458932b89edb9222dc2ac1.tar.bz2
ENV/std: use full paths to gcc versions.
This is consistent with how e.g. `gcc-4.2` is handled. This means e.g. `ghc` can find `gcc-4.8` at runtime. Fixes Homebrew/homebrew#28934.
Diffstat (limited to 'Library/Homebrew/extend')
-rw-r--r--Library/Homebrew/extend/ENV/std.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index af1e79187..9b1c6e369 100644
--- a/Library/Homebrew/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/ENV/std.rb
@@ -119,8 +119,9 @@ module Stdenv
GNU_GCC_VERSIONS.each do |n|
define_method(:"gcc-4.#{n}") do
gcc = "gcc-4.#{n}"
- self.cc = gcc
- self.cxx = gcc.gsub('c', '+')
+ gxx = gcc.gsub('c', '+')
+ self.cc = MacOS.locate(gcc)
+ self.cxx = MacOS.locate(gxx)
set_cpu_cflags
@compiler = gcc
end