Skip to content

Commit f21cf74

Browse files
committed
[build-script] When building with Xcode, do not build or test any stdlib but the macosx-x86_64 stdlib.
There is a known bug where Xcode can not properly cross compile swift standard libraries since it always wants to pass in -mmacosx-version-min (see CMakeLists.txt:512). Even though this code is in CMake, build-script if it is not told to do the correct thing, will still try to build those cross compiled libraries. This will fail since cmake did not create a target.
1 parent 770a58b commit f21cf74

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

utils/build-presets.ini

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,21 @@ skip-test-watchos
249249

250250
[preset: buildbot_incremental,tools=RA,stdlib=RA,xcode]
251251
mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
252-
build-subdir=buildbot_incremental-xcode
252+
build-subdir=buildbot_incremental_xcode
253253

254254
xcode
255255
dash-dash
256+
# We do not support building cross compiled stdlibs on OS X with Xcode. So only
257+
# build the OS X SDK.
258+
skip-build-ios
259+
skip-test-ios
260+
skip-build-tvos
261+
skip-test-tvos
262+
skip-build-watchos
263+
skip-test-watchos
264+
stdlib-deployment-targets=macosx-x86_64
265+
swift-primary-variant-sdk=OSX
266+
swift-primary-variant-arch=x86_64
256267

257268
# This preset is used by CI to test swift-corelibs-xctest.
258269
[preset: buildbot_incremental,tools=RA,stdlib=RA,XCTest]

0 commit comments

Comments
 (0)