plugins: Global compiler flags should not be used for plugin dependencies #7549
+74
−8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci test |
|
Test to follow. |
euanh
changed the title
euanh
force-pushed
the
plugin-compiler-flags
branch
from
3294290
to
abaedbf
Compare
|
@swift-ci test |
MaxDesiatov
approved these changes
May 10, 2024
xedin
reviewed
May 10, 2024
| @@ -741,7 +741,7 @@ package final class SwiftCommandState { | |||
| configuration: options.build.configuration, | |||
| toolchain: toolchain, | |||
| triple: triple, | |||
| flags: options.build.buildFlags, | |||
| flags: toolsBuild ? .init() : options.build.buildFlags, | |||
There was a problem hiding this comment.
buildFlags is a combination of C/C++/Swift/Linker/XCBuild which means that host compiler doesn't get any of them but are there situations when some of the flags intended for the host and/or tools?
At the very list I think descriptions of all flags and not just swiftCompilerFlags have to be updated to indicate that they are no longer applied to the host.
xedin
reviewed
May 10, 2024
| @@ -796,7 +796,7 @@ package final class SwiftCommandState { | |||
|
|
|||
| private lazy var _toolsBuildParameters: Result<BuildParameters, Swift.Error> = { | |||
| Result(catching: { | |||
| try _buildParams(toolchain: self.getHostToolchain()) | |||
| try _buildParams(toolchain: self.getHostToolchain(), toolsBuild: true) | |||
There was a problem hiding this comment.
Maybe instead of a boolean flag here we should just pass in the options.build.buildFlags or []?
There was a problem hiding this comment.
Yes, I think that's better and will help when we tidy up the tools/products build option split.
MaxDesiatov
added
add to change log
bug
plugins
build system
…n dependencies Build tools and end products are built with separate toolchains: * Plugins and any targets they depend on, such as helper tools, are built with the host toolchain. * End products are built with the target toolchain. Compiler flags set with -Xswiftc are intended to be applied only to end product builds, but they are incorrectly being applied to plugin tool builds as well. This can cause problems because target toolchain flags might not be suitable for a tools build. In the worst case, the build might fail completely if the host toolchain rejects the target toolchain flag. For example, Linux toochains accept the `-static-executable` flag, but macOS toolchains reject it. Fixes: rdar://127813618
euanh
force-pushed
the
plugin-compiler-flags
branch
from
abaedbf
to
8a8a86a
Compare
|
@swift-ci test |
|
@swift-ci test windows |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation:
Build tools and end products are built with separate toolchains:
are built with the host toolchain.
Compiler flags set with
-Xswiftcare intended to be applied only toend product builds, but they are incorrectly being applied to
plugin tool builds as well. This can cause problems because target
toolchain flags might not be suitable for a tools build. In the
worst case, the build might fail completely if the host toolchain
rejects the target toolchain flag. For example, Linux toochains
accept the
-static-executableflag, but macOS toolchains rejectit.
Modifications:
Global compiler flags are no longer applied to
toolsBuildParametersand so are no longer used when building plugin dependencies.
Result:
Plugin dependency builds will no longer fail because of incompatible
flags.
In future, the hidden
-Xbuild-tools-swiftflags should be passed tocommand plugin tools builds. These are currently only passed to the
plugin script runner.
Fixes: rdar://127813618