Skip to content

Commit 9d822cd

Browse files
committed
Refactored built-script-impl:
- Use consistent terminology for target platforms, disambiguate uses of 'deployment_target' in to 'host' and 'stdlib_targets' - Changed parameters to build script: - install-prefix no longer has to include toolchain-prefix on OSX - swift-sdks has been replaced by stdlib-deployment-targets - built-stdlib-deployment-targets lets you restrict which of the stdlib-deployment targets are built - Calculate stdlib_targets per host, to facilitate future cross-compiling - Only use executables from LOCAL_HOST - Only execute testable targets of the LOCAL_HOST - Remove some cases of switching on 'uname' to facilitate future cross-compiling
1 parent 52de534 commit 9d822cd

File tree

3 files changed

+812
-503
lines changed

3 files changed

+812
-503
lines changed

utils/build-presets.ini

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ dash-dash
3232
verbose-build
3333
build-ninja
3434

35-
swift-sdks=OSX;IOS;IOS_SIMULATOR;TVOS;TVOS_SIMULATOR;WATCHOS;WATCHOS_SIMULATOR
36-
3735
# Build static standard library because it is used
3836
# to build external projects.
3937
build-swift-static-stdlib
@@ -76,7 +74,7 @@ skip-build-tvos
7674
skip-test-tvos
7775
skip-build-watchos
7876
skip-test-watchos
79-
swift-sdks=OSX
77+
stdlib-deployment-targets=macosx-x86_64
8078
swift-primary-variant-sdk=OSX
8179
swift-primary-variant-arch=x86_64
8280

@@ -406,7 +404,7 @@ skip-build-tvos
406404
skip-test-tvos
407405
skip-build-watchos
408406
skip-test-watchos
409-
swift-sdks=OSX
407+
stdlib-deployment-targets=macosx-x86_64
410408
swift-primary-variant-sdk=OSX
411409
swift-primary-variant-arch=x86_64
412410

@@ -671,7 +669,6 @@ build-ninja
671669
build-swift-static-stdlib
672670
build-swift-stdlib-unittest-extra
673671
compiler-vendor=apple
674-
swift-sdks=OSX;IOS;IOS_SIMULATOR;TVOS;TVOS_SIMULATOR;WATCHOS;WATCHOS_SIMULATOR
675672

676673
install-swift
677674
install-lldb

utils/build-script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@ details of the setups of other systems or automated environments.""")
12741274
build_script_impl_args = [
12751275
"--workspace", workspace.source_root,
12761276
"--build-dir", workspace.build_root,
1277-
"--install-prefix", os.path.abspath(args.install_prefix),
1277+
"--install-prefix", args.install_prefix,
12781278
"--host-target", args.host_target,
12791279
"--stdlib-deployment-targets",
12801280
" ".join(args.stdlib_deployment_targets),

0 commit comments

Comments
 (0)