aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend/os/mac/development_tools.rb
diff options
context:
space:
mode:
authorMike McQuaid2016-12-30 20:43:27 +0000
committerGitHub2016-12-30 20:43:27 +0000
commitb1e27d689d8eadb267fb9890ec2e0a2a87e46b4e (patch)
treef9f5a346953c5ce8cb33719d7db11b8d7acfc19f /Library/Homebrew/extend/os/mac/development_tools.rb
parent9e2a8248a603bdc4c90c006dc731c4001fdef88f (diff)
parente50102d91e5fc13fd59589967bb97bb6159bbad0 (diff)
downloadbrew-b1e27d689d8eadb267fb9890ec2e0a2a87e46b4e.tar.bz2
Merge pull request #1701 from MikeMcQuaid/deprecate-std-superenv-stuff
ENV: deprecate old methods.
Diffstat (limited to 'Library/Homebrew/extend/os/mac/development_tools.rb')
-rw-r--r--Library/Homebrew/extend/os/mac/development_tools.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/extend/os/mac/development_tools.rb b/Library/Homebrew/extend/os/mac/development_tools.rb
index 8c0c48a51..1bb12a3d1 100644
--- a/Library/Homebrew/extend/os/mac/development_tools.rb
+++ b/Library/Homebrew/extend/os/mac/development_tools.rb
@@ -64,15 +64,15 @@ class DevelopmentTools
case default_cc
# if GCC 4.2 is installed, e.g. via Tigerbrew, prefer it
# over the system's GCC 4.0
- when /^gcc-4\.0/ then gcc_42_build_version ? :gcc : :gcc_4_0
- when /^gcc/ then :gcc
+ when /^gcc-4\.0/ then gcc_4_2_build_version ? :gcc_4_2 : :gcc_4_0
+ when /^gcc/ then :gcc_4_2
when "clang" then :clang
else
# guess :(
if MacOS::Xcode.version >= "4.3"
:clang
else
- :gcc
+ :gcc_4_2
end
end
end