Skip to content

Commit 20cec2e

Browse files
authored
Update deps (#929)
1 parent 31dbabd commit 20cec2e

25 files changed

+1308
-221
lines changed

cargo/cargo_bootstrap.bzl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,9 @@ def _cargo_bootstrap_repository_impl(repository_ctx):
150150

151151
binary_name = repository_ctx.attr.binary or repository_ctx.name
152152

153-
environment = _collect_environ(repository_ctx, host_triple.triple)
153+
# In addition to platform specific environment variables, a common set (indicated by `*`) will always
154+
# be gathered.
155+
environment = dict(_collect_environ(repository_ctx, "*").items() + _collect_environ(repository_ctx, host_triple.triple).items())
154156

155157
built_binary = cargo_bootstrap(
156158
repository_ctx,
@@ -198,14 +200,15 @@ cargo_bootstrap_repository = repository_rule(
198200
"env": attr.string_dict(
199201
doc = (
200202
"A mapping of platform triple to a set of environment variables. See " +
201-
"[cargo_env](#cargo_env) for usage details."
203+
"[cargo_env](#cargo_env) for usage details. Additionally, the platform triple `*` applies to all platforms."
202204
),
203205
),
204206
"env_label": attr.string_dict(
205207
doc = (
206208
"A mapping of platform triple to a set of environment variables. This " +
207209
"attribute differs from `env` in that all variables passed here must be " +
208-
"fully qualified labels of files. See [cargo_env](#cargo_env) for usage details."
210+
"fully qualified labels of files. See [cargo_env](#cargo_env) for usage details. " +
211+
"Additionally, the platform triple `*` applies to all platforms."
209212
),
210213
),
211214
"iso_date": attr.string(

0 commit comments

Comments
 (0)