Skip to content

Commit 25d3c0c

Browse files
committed
- Added armv7s and arm64 to ARCHS
- Removed VALID_ARCHS config values, these already get set automatically from the SDK
1 parent 5d9e87d commit 25d3c0c

File tree

2 files changed

+35
-14
lines changed

2 files changed

+35
-14
lines changed

JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8622,7 +8622,11 @@
86228622
isa = XCBuildConfiguration;
86238623
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
86248624
buildSettings = {
8625-
ARCHS = armv7;
8625+
ARCHS = (
8626+
arm64,
8627+
armv7s,
8628+
armv7,
8629+
);
86268630
DEAD_CODE_STRIPPING = YES;
86278631
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
86288632
GCC_OPTIMIZATION_LEVEL = 3;
@@ -8650,15 +8654,18 @@
86508654
SDKROOT = iphoneos;
86518655
STRIP_INSTALLED_PRODUCT = YES;
86528656
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
8653-
VALID_ARCHS = "i386 armv7";
86548657
};
86558658
name = Debug;
86568659
};
86578660
B6479BD91829146300CCF60F /* Release */ = {
86588661
isa = XCBuildConfiguration;
86598662
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
86608663
buildSettings = {
8661-
ARCHS = armv7;
8664+
ARCHS = (
8665+
arm64,
8666+
armv7s,
8667+
armv7,
8668+
);
86628669
DEAD_CODE_STRIPPING = YES;
86638670
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
86648671
GCC_OPTIMIZATION_LEVEL = 3;
@@ -8686,15 +8693,18 @@
86868693
SDKROOT = iphoneos;
86878694
STRIP_INSTALLED_PRODUCT = YES;
86888695
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
8689-
VALID_ARCHS = "i386 armv7";
86908696
};
86918697
name = Release;
86928698
};
86938699
B6479BDA1829146300CCF60F /* Profiling */ = {
86948700
isa = XCBuildConfiguration;
86958701
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
86968702
buildSettings = {
8697-
ARCHS = armv7;
8703+
ARCHS = (
8704+
arm64,
8705+
armv7s,
8706+
armv7,
8707+
);
86988708
DEAD_CODE_STRIPPING = YES;
86998709
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
87008710
GCC_OPTIMIZATION_LEVEL = 3;
@@ -8722,15 +8732,18 @@
87228732
SDKROOT = iphoneos;
87238733
STRIP_INSTALLED_PRODUCT = YES;
87248734
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
8725-
VALID_ARCHS = "i386 armv7";
87268735
};
87278736
name = Profiling;
87288737
};
87298738
B6479BDB1829146300CCF60F /* Production */ = {
87308739
isa = XCBuildConfiguration;
87318740
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
87328741
buildSettings = {
8733-
ARCHS = armv7;
8742+
ARCHS = (
8743+
arm64,
8744+
armv7s,
8745+
armv7,
8746+
);
87348747
BUILD_VARIANTS = normal;
87358748
DEAD_CODE_STRIPPING = YES;
87368749
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -8758,7 +8771,6 @@
87588771
SDKROOT = iphoneos;
87598772
STRIP_INSTALLED_PRODUCT = YES;
87608773
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
8761-
VALID_ARCHS = "i386 armv7";
87628774
};
87638775
name = Production;
87648776
};

WTF/WTF.xcodeproj/project.pbxproj

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,7 +1992,11 @@
19921992
isa = XCBuildConfiguration;
19931993
baseConfigurationReference = 5D247B7314689C4700E78B76 /* WTF.xcconfig */;
19941994
buildSettings = {
1995-
ARCHS = armv7;
1995+
ARCHS = (
1996+
arm64,
1997+
armv7s,
1998+
armv7,
1999+
);
19962000
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
19972001
GCC_PREPROCESSOR_DEFINITIONS = (
19982002
"$(DEBUG_DEFINES)",
@@ -2008,15 +2012,18 @@
20082012
SDKROOT = iphoneos;
20092013
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
20102014
TARGETED_DEVICE_FAMILY = "1,2";
2011-
VALID_ARCHS = armv7;
20122015
};
20132016
name = Debug;
20142017
};
20152018
B6F09CA418290CFA00D62E5F /* Release */ = {
20162019
isa = XCBuildConfiguration;
20172020
baseConfigurationReference = 5D247B7314689C4700E78B76 /* WTF.xcconfig */;
20182021
buildSettings = {
2019-
ARCHS = armv7;
2022+
ARCHS = (
2023+
arm64,
2024+
armv7s,
2025+
armv7,
2026+
);
20202027
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
20212028
GCC_PREPROCESSOR_DEFINITIONS = (
20222029
"$(DEBUG_DEFINES)",
@@ -2032,15 +2039,18 @@
20322039
SDKROOT = iphoneos;
20332040
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
20342041
TARGETED_DEVICE_FAMILY = "1,2";
2035-
VALID_ARCHS = armv7;
20362042
};
20372043
name = Release;
20382044
};
20392045
B6F09CA518290CFA00D62E5F /* Production */ = {
20402046
isa = XCBuildConfiguration;
20412047
baseConfigurationReference = 5D247B7314689C4700E78B76 /* WTF.xcconfig */;
20422048
buildSettings = {
2043-
ARCHS = armv7;
2049+
ARCHS = (
2050+
arm64,
2051+
armv7s,
2052+
armv7,
2053+
);
20442054
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
20452055
GCC_PREPROCESSOR_DEFINITIONS = (
20462056
"$(DEBUG_DEFINES)",
@@ -2056,7 +2066,6 @@
20562066
SDKROOT = iphoneos;
20572067
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
20582068
TARGETED_DEVICE_FAMILY = "1,2";
2059-
VALID_ARCHS = armv7;
20602069
};
20612070
name = Production;
20622071
};

0 commit comments

Comments
 (0)