Skip to content

Commit ed225d6

Browse files
authored
Merge pull request swiftlang#255 from apple/build-watchos-armv7k
Only build watchOS project for armv7k <rdar://problem/44522408>
2 parents ce3e959 + f873b93 commit ed225d6

File tree

3 files changed

+44
-3
lines changed

3 files changed

+44
-3
lines changed

project.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ def get_build_command(self, incremental=False):
124124
command += ['-configuration', value]
125125
else:
126126
command += ['%s=%s' % (setting, value)]
127+
if self._destination == 'generic/platform=watchOS':
128+
command += ['ARCHS=armv7k']
127129

128130
return command
129131

project_future.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ def get_build_command(self, incremental=False):
124124
'SWIFT_TREAT_WARNINGS_AS_ERRORS=NO'])
125125
command += self._added_xcodebuild_flags
126126

127+
if self._destination == 'generic/platform=watchOS':
128+
command += ['ARCHS=armv7k']
129+
127130
return command
128131

129132
def get_test_command(self, incremental=False):

projects.json

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,7 +1500,17 @@
15001500
"project": "ProcedureKit.xcodeproj",
15011501
"target": "ProcedureKit",
15021502
"destination": "generic/platform=watchOS",
1503-
"configuration": "Release"
1503+
"configuration": "Release",
1504+
"xfail": {
1505+
"compatibility": {
1506+
"3.0": {
1507+
"branch": {
1508+
"master": "https://bugs.swift.org/browse/SR-8780",
1509+
"swift-4.2-branch": "https://bugs.swift.org/browse/SR-8780"
1510+
}
1511+
}
1512+
}
1513+
}
15041514
},
15051515
{
15061516
"action": "BuildXcodeProjectTarget",
@@ -1571,7 +1581,17 @@
15711581
"project": "PromiseKit.xcodeproj",
15721582
"target": "PromiseKit",
15731583
"destination": "generic/platform=watchOS",
1574-
"configuration": "Release"
1584+
"configuration": "Release",
1585+
"xfail": {
1586+
"compatibility": {
1587+
"4.0.3": {
1588+
"branch": {
1589+
"master": "https://bugs.swift.org/browse/SR-8781",
1590+
"swift-4.2-branch": "https://bugs.swift.org/browse/SR-8781"
1591+
}
1592+
}
1593+
}
1594+
}
15751595
},
15761596
{
15771597
"action": "BuildXcodeProjectTarget",
@@ -2617,7 +2637,23 @@
26172637
"project": "Mapper.xcodeproj",
26182638
"target": "Mapper",
26192639
"destination": "generic/platform=watchOS",
2620-
"configuration": "Release"
2640+
"configuration": "Release",
2641+
"xfail": {
2642+
"compatibility": {
2643+
"4.0": {
2644+
"branch": {
2645+
"master": "https://bugs.swift.org/browse/SR-8778",
2646+
"swift-4.2-branch": "https://bugs.swift.org/browse/SR-8778"
2647+
}
2648+
},
2649+
"4.2": {
2650+
"branch": {
2651+
"master": "https://bugs.swift.org/browse/SR-8778",
2652+
"swift-4.2-branch": "https://bugs.swift.org/browse/SR-8778"
2653+
}
2654+
}
2655+
}
2656+
}
26212657
},
26222658
{
26232659
"action": "BuildSwiftPackage",

0 commit comments

Comments
 (0)