Skip to content

Commit

Permalink
Refactored built-script-impl:
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
springsup committed May 30, 2016
1 parent 52de534 commit 9d822cd
Show file tree
Hide file tree
Showing 3 changed files with 812 additions and 503 deletions.
7 changes: 2 additions & 5 deletions utils/build-presets.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ dash-dash
verbose-build
build-ninja

swift-sdks=OSX;IOS;IOS_SIMULATOR;TVOS;TVOS_SIMULATOR;WATCHOS;WATCHOS_SIMULATOR

# Build static standard library because it is used
# to build external projects.
build-swift-static-stdlib
Expand Down Expand Up @@ -76,7 +74,7 @@ skip-build-tvos
skip-test-tvos
skip-build-watchos
skip-test-watchos
swift-sdks=OSX
stdlib-deployment-targets=macosx-x86_64
swift-primary-variant-sdk=OSX
swift-primary-variant-arch=x86_64

Expand Down Expand Up @@ -406,7 +404,7 @@ skip-build-tvos
skip-test-tvos
skip-build-watchos
skip-test-watchos
swift-sdks=OSX
stdlib-deployment-targets=macosx-x86_64
swift-primary-variant-sdk=OSX
swift-primary-variant-arch=x86_64

Expand Down Expand Up @@ -671,7 +669,6 @@ build-ninja
build-swift-static-stdlib
build-swift-stdlib-unittest-extra
compiler-vendor=apple
swift-sdks=OSX;IOS;IOS_SIMULATOR;TVOS;TVOS_SIMULATOR;WATCHOS;WATCHOS_SIMULATOR

install-swift
install-lldb
Expand Down
2 changes: 1 addition & 1 deletion utils/build-script
Original file line number Diff line number Diff line change
Expand Up @@ -1274,7 +1274,7 @@ details of the setups of other systems or automated environments.""")
build_script_impl_args = [
"--workspace", workspace.source_root,
"--build-dir", workspace.build_root,
"--install-prefix", os.path.abspath(args.install_prefix),
"--install-prefix", args.install_prefix,
"--host-target", args.host_target,
"--stdlib-deployment-targets",
" ".join(args.stdlib_deployment_targets),
Expand Down
Loading

0 comments on commit 9d822cd

Please sign in to comment.