Skip to content

Basics/Commands: add experimental CC SDK paths option #5879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 10, 2022

Conversation

MaxDesiatov
Copy link
Contributor

Motivation:

The experimental option doesn't do anything yet, but this PR lays some groundwork for cross-compilation SDK bundles support.

Modifications:

Extended FileSystem to support new sdks subdirectory of either idiomaticSwiftPMDirectory or dotSwiftPM directories. Added new option to LocationOptions.

Result:

--experimental-cc-sdks-path option can be passed a path to a directory with cross-compilation SDK bundles. The option is hidden and as of this PR has no effect whatsoever.

@MaxDesiatov
Copy link
Contributor Author

@swift-ci please smoke test

@MaxDesiatov MaxDesiatov changed the title Basics/Commands: add experimental-cc-sdks-path option Basics/Commands: add experimental CC SDK paths option Nov 4, 2022
@MaxDesiatov MaxDesiatov changed the base branch from main to swift-bootstrap-cmd-3 November 4, 2022 17:44
@MaxDesiatov MaxDesiatov force-pushed the maxd/cc-sdks-option branch 2 times, most recently from cab08c6 to 6a04b29 Compare November 4, 2022 17:45
This reverts commit cf19c64 and restores the `--build-path` option. It also switches the `bootstrap` script back to using it so that we have an easy check that the option is still present.
@neonichu neonichu force-pushed the swift-bootstrap-cmd-3 branch from bc6b7de to 2c52312 Compare November 9, 2022 20:55
Base automatically changed from swift-bootstrap-cmd-3 to main November 10, 2022 18:30
…xd/cc-sdks-option

# Conflicts:
#	Sources/CoreCommands/Options.swift
#	Sources/CoreCommands/SwiftTool.swift
@MaxDesiatov
Copy link
Contributor Author

@swift-ci please smoke test

@MaxDesiatov MaxDesiatov enabled auto-merge (squash) November 10, 2022 21:19
@MaxDesiatov
Copy link
Contributor Author

@swift-ci please smoke test

@MaxDesiatov MaxDesiatov merged commit 2faf9d2 into main Nov 10, 2022
@MaxDesiatov MaxDesiatov deleted the maxd/cc-sdks-option branch November 11, 2022 10:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants