2 files changed, 13 insertions, 3 deletions
diff --git a/Library/Formula/postgresql.rb b/Library/Formula/postgresql.rb
index 8cd9a1d93..64592e1d1 100644
--- a/Library/Formula/postgresql.rb
+++ b/Library/Formula/postgresql.rb
@@ -20,15 +20,19 @@ class Postgresql <Formula
         "--disable-debug"
     ]
 
-    if MACOS_VERSION >= 10.6
-      configure_args << "ARCHFLAGS='-arch x86_64'"
+    if MACOS_VERSION >= 10.6 && Hardware.is_64_bit?
+        configure_args << "ARCHFLAGS='-arch x86_64'"
+    end
+
+    # Fails on Core Duo with O4 and O3
+    if Hardware.intel_family == :core
+      ENV.O2
     end
 
     system "./configure", *configure_args
     system "make install"
 
     (prefix+'org.postgresql.postgres.plist').write startup_plist
-
   end
 
   def skip_clean? path
diff --git a/Library/Homebrew/brewkit.rb b/Library/Homebrew/brewkit.rb
index 6c85c406f..3d25edc92 100644
--- a/Library/Homebrew/brewkit.rb
+++ b/Library/Homebrew/brewkit.rb
@@ -128,6 +128,12 @@ module HomebrewEnvExtension
     remove_from_cflags '-O4'
     append_to_cflags '-O3'
   end
+  def O2
+    # Sometimes O3 doesn't work or produces bad binaries
+    remove_from_cflags '-O4'
+    remove_from_cflags '-O3'
+    append_to_cflags '-O2'
+  end
   def gcc_4_2
     # Sometimes you want to downgrade from LLVM to GCC 4.2
     self['CC']="gcc-4.2"