Update to build only active arch for debug and Xcode 6.1 auto-changes