aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorRobert Shaw2010-03-16 13:08:32 -0700
committerAdam Vandenberg2010-03-16 20:46:10 -0700
commitca313defe4658d16c003871ef63784fe0b7d1d49 (patch)
tree85ef05019bf90e39cf63c08c8d014ca5caedd151 /bin
parent098b97801bbc237dc9a4105c5a016478dfdcdb9c (diff)
downloadbrew-ca313defe4658d16c003871ef63784fe0b7d1d49.tar.bz2
Add GCC 4.0 info to --config output.
* Adds GCC 4.0 version info to --config output. * Splits gcc_build into gcc_40_build and gcc_42_build. * Adds alias gcc_build to gcc_42_build for compatibility. * Updates Xcode checking to also check GCC 4.0 version. These changes are a combination of work by AdamV and my work on my Tiger branch. This information would be useful for all installs since some formulae compile with GCC 4.0. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/brew8
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/brew b/bin/brew
index 8d063303d..cad3de721 100755
--- a/bin/brew
+++ b/bin/brew
@@ -43,7 +43,8 @@ def dump_config
bits = Hardware.bits
cores = Hardware.cores_as_words
llvm = llvm_build
- gcc = gcc_build
+ gcc_42 = gcc_42_build
+ gcc_40 = gcc_40_build
sha = `cd #{HOMEBREW_REPOSITORY} && git rev-parse --verify HEAD 2> /dev/null`.chomp
kernel_arch = `uname -m`.chomp
@@ -59,7 +60,8 @@ Hardware: #{cores}-core #{bits}-bit #{Hardware.intel_family}
OS X: #{MACOS_FULL_VERSION}
Kernel Architecture: #{kernel_arch}
Ruby: #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}
-GCC-4.2: #{gcc ? "build #{gcc}" : "N/A"} (5577 or newer recommended)
+GCC-4.0: #{gcc_40 ? "build #{gcc_40}" : "N/A"} (5493 or newer recommended)
+GCC-4.2: #{gcc_42 ? "build #{gcc_42}" : "N/A"} (5577 or newer recommended)
LLVM: #{llvm ? "build #{llvm}" : "N/A" } #{llvm ? "(2206 or newer recommended)" : "" }
MacPorts or Fink? #{macports_or_fink_installed?}
X11 installed? #{x11_installed?}
@@ -256,7 +258,7 @@ begin
if MACOS_VERSION >= 10.6
opoo "You should upgrade to Xcode 3.2.1" if llvm_build < 2206
else
- opoo "You should upgrade to Xcode 3.1.4" if gcc_build < 5577
+ opoo "You should upgrade to Xcode 3.1.4" if (gcc_40_build < 5493) or (gcc_42_build < 5577)
end
rescue
# the reason we don't abort is some formula don't require Xcode