admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Utils: update gcc version detection logic

Browse Source 
Homebrew was attempting to check the version of gcc-4.0 and gcc-4.2 even
if they don't exist, causing `doctor` and `--config` to throw nasty
errors.

Also fixes the broken missing gcc-4.2 detection, which was confusing
Xcode 4.2 users.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
Misty De Meo 2011-11-25 19:30:42 -06:00 committed by Adam Vandenberg
parent 0fd47f2014
commit f017f2d2f5
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/utils.rb
View File

@ -261,26 +261,16 @@ module MacOS extend self
end end
def gcc_42_build_version def gcc_42_build_version
`/usr/bin/gcc-4.2 --version` =~ /build (\d{4,})/ @gcc_42_build_version ||= if File.exist? "/usr/bin/gcc-4.2"
if $1 `/usr/bin/gcc-4.2 --version` =~ /build (\d{4,})/
$1.to_i $1.to_i
elsif system "/usr/bin/which gcc"
# Xcode 3.0 didn't come with gcc-4.2
# We can't change the above regex to use gcc because the version numbers
# are different and thus, not useful.
# FIXME I bet you 20 quid this causes a side effect — magic values tend to
401
else
nil
end end
end end
def gcc_40_build_version def gcc_40_build_version
`/usr/bin/gcc-4.0 --version` =~ /build (\d{4,})/ @gcc_40_build_version ||= if File.exist? "/usr/bin/gcc-4.0"
if $1 `/usr/bin/gcc-4.0 --version` =~ /build (\d{4,})/
$1.to_i $1.to_i
else
nil
end end
end end