- Added armv7s and arm64 to ARCHS

- Removed VALID_ARCHS config values, these already get set automatically from the SDK
CLARKYJ · Jan 16, 2014 · 25d3c0c · 25d3c0c
1 parent 5d9e87d
commit 25d3c0c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 14 deletions.
diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -8622,7 +8622,11 @@
  isa = XCBuildConfiguration;
  baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
  buildSettings = {
- ARCHS = armv7;
+ ARCHS = (
+ arm64,
+ armv7s,
+ armv7,
+ );
  DEAD_CODE_STRIPPING = YES;
  GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
  GCC_OPTIMIZATION_LEVEL = 3;
@@ -8650,15 +8654,18 @@
  SDKROOT = iphoneos;
  STRIP_INSTALLED_PRODUCT = YES;
  SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
- VALID_ARCHS = "i386 armv7";
  };
  name = Debug;
  };
  B6479BD91829146300CCF60F /* Release */ = {
  isa = XCBuildConfiguration;
  baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
  buildSettings = {
- ARCHS = armv7;
+ ARCHS = (
+ arm64,
+ armv7s,
+ armv7,
+ );
  DEAD_CODE_STRIPPING = YES;
  GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
  GCC_OPTIMIZATION_LEVEL = 3;
@@ -8686,15 +8693,18 @@
  SDKROOT = iphoneos;
  STRIP_INSTALLED_PRODUCT = YES;
  SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
- VALID_ARCHS = "i386 armv7";
  };
  name = Release;
  };
  B6479BDA1829146300CCF60F /* Profiling */ = {
  isa = XCBuildConfiguration;
  baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
  buildSettings = {
- ARCHS = armv7;
+ ARCHS = (
+ arm64,
+ armv7s,
+ armv7,
+ );
  DEAD_CODE_STRIPPING = YES;
  GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
  GCC_OPTIMIZATION_LEVEL = 3;
@@ -8722,15 +8732,18 @@
  SDKROOT = iphoneos;
  STRIP_INSTALLED_PRODUCT = YES;
  SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
- VALID_ARCHS = "i386 armv7";
  };
  name = Profiling;
  };
  B6479BDB1829146300CCF60F /* Production */ = {
  isa = XCBuildConfiguration;
  baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
  buildSettings = {
- ARCHS = armv7;
+ ARCHS = (
+ arm64,
+ armv7s,
+ armv7,
+ );
  BUILD_VARIANTS = normal;
  DEAD_CODE_STRIPPING = YES;
  GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -8758,7 +8771,6 @@
  SDKROOT = iphoneos;
  STRIP_INSTALLED_PRODUCT = YES;
  SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
- VALID_ARCHS = "i386 armv7";
  };
  name = Production;
  };

diff --git a/WTF/WTF.xcodeproj/project.pbxproj b/WTF/WTF.xcodeproj/project.pbxproj
@@ -1992,7 +1992,11 @@
  isa = XCBuildConfiguration;
  baseConfigurationReference = 5D247B7314689C4700E78B76 /* WTF.xcconfig */;
  buildSettings = {
- ARCHS = armv7;
+ ARCHS = (
+ arm64,
+ armv7s,
+ armv7,
+ );
  GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
  GCC_PREPROCESSOR_DEFINITIONS = (
  "$(DEBUG_DEFINES)",
@@ -2008,15 +2012,18 @@
  SDKROOT = iphoneos;
  SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
  TARGETED_DEVICE_FAMILY = "1,2";
- VALID_ARCHS = armv7;
  };
  name = Debug;
  };
  B6F09CA418290CFA00D62E5F /* Release */ = {
  isa = XCBuildConfiguration;
  baseConfigurationReference = 5D247B7314689C4700E78B76 /* WTF.xcconfig */;
  buildSettings = {
- ARCHS = armv7;
+ ARCHS = (
+ arm64,
+ armv7s,
+ armv7,
+ );
  GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
  GCC_PREPROCESSOR_DEFINITIONS = (
  "$(DEBUG_DEFINES)",
@@ -2032,15 +2039,18 @@
  SDKROOT = iphoneos;
  SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
  TARGETED_DEVICE_FAMILY = "1,2";
- VALID_ARCHS = armv7;
  };
  name = Release;
  };
  B6F09CA518290CFA00D62E5F /* Production */ = {
  isa = XCBuildConfiguration;
  baseConfigurationReference = 5D247B7314689C4700E78B76 /* WTF.xcconfig */;
  buildSettings = {
- ARCHS = armv7;
+ ARCHS = (
+ arm64,
+ armv7s,
+ armv7,
+ );
  GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
  GCC_PREPROCESSOR_DEFINITIONS = (
  "$(DEBUG_DEFINES)",
@@ -2056,7 +2066,6 @@
  SDKROOT = iphoneos;
  SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
  TARGETED_DEVICE_FAMILY = "1,2";
- VALID_ARCHS = armv7;
  };
  name = Production;
  };