Fix gmp formula for 10.5 / MacPro.

1 files changed, 22 insertions, 7 deletions

diff --git a/Library/Formula/gmp.rb b/Library/Formula/gmp.rb
index 312bd0940..c4f5594c4 100644
--- a/Library/Formula/gmp.rb
+++ b/Library/Formula/gmp.rb
@@ -5,16 +5,31 @@ class Gmp <Formula
   homepage 'http://gmplib.org/'
   sha1 'acbd1edc61230b1457e9742136994110e4f381b2'
 
+  def options
+    [
+      ["--skip-check", "Do not run 'make check' to verify libraries. (Not recommended.)"]
+    ]
+  end
+
   def install
-    if MACOS_VERSION == 10.6
-      # On OS X 10.6, some tests fail under LLVM
-      ENV.gcc_4_2
-    end
+    # On OS X 10.6, some tests fail under LLVM
+    ENV.gcc_4_2
+    
+    args = ["--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"]
 
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
+    # Doesn't compile correctly on 10.5 MacPro in 64 bit mode
+    if MACOS_VERSION == 10.5 and Hardware.intel_family == :nehalem
+      ENV.m32
+      args << "--host=none-apple-darwin"
+    end
+    
+    system "./configure", *args
+    system "make"
+    ENV.j1 # Don't install in parallel
     system "make install"
     
-    # Verify that the library compiled correctly.
-    system "make check"
+    # Different compilers and options can cause tests to fail even
+    # if everything compiles, so yes, we want to do this step.
+    system "make check" unless ARGV.include? "--skip-check"
   end
 end