lib/vendor/darwin/ext/extconf.rb in guard-0.10.0 vs lib/vendor/darwin/ext/extconf.rb in guard-1.0.0

@@ -19,14 +19,17 @@
   sdk_version    = { 9 => '10.5', 10 => '10.6', 11 => '10.7' }[darwin_version]
 
   raise "Only Darwin systems greater than 8 (Mac OS X 10.5+) are supported" unless sdk_version
 
   core_flags = %W{
-    -isysroot #{xcode_path}/SDKs/MacOSX#{sdk_version}.sdk
+    -isysroot "#{xcode_path}/SDKs/MacOSX#{sdk_version}.sdk"
     -mmacosx-version-min=#{sdk_version} -mdynamic-no-pic -std=gnu99
   }
 
   cflags = core_flags + %w{-Os -pipe}
+
+  arch_sig = `uname -m`
+  cflags << '-arch i386'  if arch_sig =~ /i386$/i
 
   wflags = %w{
     -Wmissing-prototypes -Wreturn-type -Wmissing-braces -Wparentheses -Wswitch
     -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable
     -Wunused-value -Wuninitialized -Wunknown-pragmas -Wshadow