Skip to content

Conversation

@artemcm
Copy link
Contributor

@artemcm artemcm commented Feb 6, 2023

This change removes instances where the driver modified command-line invocations used to build Swift module dependencies, as produced by the dependency scanner. Instead, the scanner will now emit command line argument sets that are sufficient to build all such module dependencies out-of-the-box, including explicit dependency inputs.

The scanner adopts (swiftlang/swift#63460) newly-(re-)added -swift-module-file to specify explicit Swift interface dependencies' explicit dependencies. The driver continues using -explicit-swift-module-map-file JSON file input to specify all explicit dependencies for the main module's compilation commands (emit-module, compile, etc.), furthermore moving prebuilt Clang dependencies to also appear in this file, thanks to @allevato's change in swiftlang/swift#63178.

@artemcm artemcm marked this pull request as draft February 6, 2023 17:39
@artemcm
Copy link
Contributor Author

artemcm commented Feb 6, 2023

We should wait a fair bit to merge this, at least until swiftlang/swift#63460 makes it to a toolchain snapshot picked up by CI.

@artemcm
Copy link
Contributor Author

artemcm commented Feb 10, 2023

swiftlang/swift#63460 has made it to a nightly toolchain. (swift-DEVELOPMENT-SNAPSHOT-2023-02-09-a )

@artemcm
Copy link
Contributor Author

artemcm commented Feb 10, 2023

@swift-ci test

…mplete compile commands for Swift dependencies

This change removes instances where the driver modified command-line invocations used to build Swift module dependencies, as produced by the dependency scanner.
Instead, the scanner will now emit command lines that are sufficient to build all such module dependencies, including explicit dependency inputs.
@artemcm artemcm force-pushed the SelfContainedExplicitSwiftDeps branch from 22d0173 to c643884 Compare February 13, 2023 16:55
@artemcm
Copy link
Contributor Author

artemcm commented Feb 13, 2023

@swift-ci test

@artemcm artemcm marked this pull request as ready for review February 13, 2023 18:21
@artemcm
Copy link
Contributor Author

artemcm commented Feb 15, 2023

Not to be merged until swiftlang/swift#63697 lands, otherwise Explicit Modules functionality will be limited.

@artemcm
Copy link
Contributor Author

artemcm commented Feb 21, 2023

@swift-ci test

@artemcm artemcm merged commit 3a2ccf4 into swiftlang:main Feb 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants