Propagate restricted_to and compatible_with attributes in cgo rules #1493
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
|
I'll have a look at the failing build. |
jayconrod
reviewed
May 9, 2018
go/private/rules/cgo.bzl
Outdated
| @@ -523,6 +523,8 @@ def setup_cgo_library(name, srcs, cdeps, copts, cxxopts, cppopts, clinkopts, obj | |||
|
|
|||
| if objc: | |||
| cgo_objc_lib_name = name + ".cgo_objc_lib" | |||
| kwargs = extra_args | |||
| kwargs.update(objcopts) | |||
There was a problem hiding this comment.
I think you need to update objcopts with extra_args here instead of updating extra_args. This statement modifies extra_args, which is used in other rules below.
There was a problem hiding this comment.
Oh, right! Thanks for catching this.
go/private/rules/cgo.bzl
Outdated
| @@ -397,7 +397,7 @@ _cgo_collect_info = go_rule( | |||
| """No-op rule that collects information from _cgo_codegen and cc_library | |||
| info into a GoSourceList provider for easy consumption.""" | |||
|
|
|||
| def setup_cgo_library(name, srcs, cdeps, copts, cxxopts, cppopts, clinkopts, objc, objcopts, tags): | |||
| def setup_cgo_library(name, srcs, cdeps, copts, cxxopts, cppopts, clinkopts, objc, objcopts, **extra_args): | |||
There was a problem hiding this comment.
One small nit: rename extra_args to common_attrs.
jayconrod
approved these changes
May 9, 2018
|
Thanks! The Travis failure appears to be a problem with Travis CI itself, not this change. Tests pass locally and on Buildkite, so force submitting. |
jayconrod
pushed a commit
that referenced
this pull request
Jun 12, 2018
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.
This fixes #1488.