Revert back to build all architectures to fix compiling on Xcode 4