diff options
| author |  vladmos <vladmos@google.com> | 2018-01-03 12:20:57 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-03 12:22:55 -0800 |
| commit | ceaed5145f5ad27facd103a79d047cf0e301b4b5 (patch) | |
| tree | 86d92a80caa06522c5f21ea971b3b692d3520016 /tools/cpp/unix_cc_configure.bzl | |
| parent | e981d20dafc268ff9c1b5e23452e060327a0ace2 (diff) | |
Remove usages of `+` on dicts
The `+` operator on dicts is deprecated and will be removed. This change makes
Bazel files compatible with the new behavior.
Fixes #4346.
PiperOrigin-RevId: 180702882
Diffstat (limited to 'tools/cpp/unix_cc_configure.bzl')
| -rw-r--r-- | tools/cpp/unix_cc_configure.bzl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl index 4657ba4ebb..1df03d2b02 100644 --- a/tools/cpp/unix_cc_configure.bzl +++ b/tools/cpp/unix_cc_configure.bzl @@ -103,7 +103,7 @@ def _find_tool(repository_ctx, tool, overriden_tools): def _get_tool_paths(repository_ctx, darwin, cc, overriden_tools): """Compute the path to the various tools. Doesn't %-escape the result!""" - return {k: _find_tool(repository_ctx, k, overriden_tools) + return dict({k: _find_tool(repository_ctx, k, overriden_tools) for k in [ "ld", "cpp", @@ -113,11 +113,11 @@ def _get_tool_paths(repository_ctx, darwin, cc, overriden_tools): "objcopy", "objdump", "strip", - ]} + { + ]}.items() + { "gcc": cc, "ar": "/usr/bin/libtool" if darwin else which(repository_ctx, "ar", "/usr/bin/ar") - } + }.items()) def _escaped_cplus_include_paths(repository_ctx): |