-
Notifications
You must be signed in to change notification settings - Fork 153
Support additional_linker_inputs in swift_binary
#1584
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
base: master
Are you sure you want to change the base?
Support additional_linker_inputs in swift_binary
#1584
Conversation
5e49b82 to
ac269f8
Compare
swift/swift_binary.bzl
Outdated
| ctx, | ||
| ctx.attr.linkopts, | ||
| ctx.attr.swiftc_inputs, | ||
| ctx.attr.swiftc_inputs + ctx.attr.additional_linker_inputs, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we want to remove swiftc_inputs here?
| expected_inputs = ctx.attr.expected_additional_inputs | ||
| expected_linkopts = ctx.attr.expected_linkopts | ||
|
|
||
| action_input_paths = set([input.short_path for input in link_action.inputs.to_list()]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like we can't use set yet in our tests, since they run on Bazel 7.
swift/swift_binary.bzl
Outdated
| create_linking_context_from_compilation_outputs( | ||
| actions = ctx.actions, | ||
| additional_inputs = ctx.files.swiftc_inputs, | ||
| additional_inputs = ctx.files.swiftc_inputs + ctx.files.additional_linker_inputs, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we want to remove swiftc_inputs here?
|
@brentleyjones I updated the PR. I left |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While this is technically a breaking change, in a way that could be hard to fix in non-root modules, it doesn't look like any public modules was using swiftc_inputs for linker inputs. So I'm fine with this if @keith is.
|
sure, i like naming matching other rules |
064b690 to
6f43932
Compare
Addresses #1511