Fix up build architecture lists

diederich · Jun 25, 2014 · 8044261 · 8044261
1 parent fc0925d
commit 8044261
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Base/Common.xcconfig b/Base/Common.xcconfig
@@ -7,6 +7,9 @@
 // Disable legacy-compatible header searching
 ALWAYS_SEARCH_USER_PATHS = NO
 
+// Architectures to build
+ARCHS = $(ARCHS_STANDARD)
+
 // Whether to warn when a floating-point value is used as a loop counter
 CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES
 

diff --git a/Mac OS X/Mac-Base.xcconfig b/Mac OS X/Mac-Base.xcconfig
@@ -16,4 +16,4 @@ SDKROOT = macosx
 SUPPORTED_PLATFORMS = macosx
 
 // Supported architectures
-VALID_ARCHS = i386 x86_64
+VALID_ARCHS = x86_64
diff --git a/iOS/iOS-Base.xcconfig b/iOS/iOS-Base.xcconfig
@@ -4,8 +4,8 @@
 // a configuration file for a specific type of target.
 //
 
-// Architectures to build
-ARCHS = $(ARCHS_STANDARD_INCLUDING_64_BIT)
+// Xcode needs this to find archived headers if SKIP_INSTALL is set
+HEADER_SEARCH_PATHS = $(OBJROOT)/UninstalledProducts/include
 
 // Whether to only build the active architecture (overridden from Debug/Profile)
 ONLY_ACTIVE_ARCH = NO
@@ -14,11 +14,8 @@ ONLY_ACTIVE_ARCH = NO
 // assumed)
 SDKROOT = iphoneos
 
-// Xcode needs this to find archived headers if SKIP_INSTALL is set
-HEADER_SEARCH_PATHS = $(OBJROOT)/UninstalledProducts/include
-
 // Supported SDK platforms
 SUPPORTED_PLATFORMS = iphonesimulator iphoneos
 
 // Supported architectures
-VALID_ARCHS = armv6 armv7 armv7s arm64 i386 x86_64
+VALID_ARCHS = armv7 armv7s arm64 x86_64