diff options
| author |  Florian Weikert <fwe@google.com> | 2015-08-18 14:34:09 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2015-08-20 14:43:46 +0000 |
| commit | b537f8250ae1d3d39336c9cf90fc1bba831c6a0f (patch) | |
| tree | 2d32375d5516a235d77c4f4dae33f0bd1f868581 /tools | |
| parent | 49532e17569b712a423f38687114d603f59aa012 (diff) | |
Updated some bazel files to reflect the new way of how configuration fragments can be accessed.
--
MOS_MIGRATED_REVID=100923388
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build_rules/java_rules_skylark.bzl | 8 | ||||
| -rw-r--r-- | tools/build_rules/rust/rust.bzl | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/build_rules/java_rules_skylark.bzl b/tools/build_rules/java_rules_skylark.bzl index 4f9951d049..bee8f254fa 100644 --- a/tools/build_rules/java_rules_skylark.bzl +++ b/tools/build_rules/java_rules_skylark.bzl @@ -16,11 +16,11 @@ java_filetype = FileType([".java"]) jar_filetype = FileType([".jar"]) srcjar_filetype = FileType([".jar", ".srcjar"]) -def is_windows(config): - return config.fragment(cpp).compiler.startswith("windows_") +def is_windows(fragments): + return fragments.cpp.compiler.startswith("windows_") def path_separator(ctx): - if is_windows(ctx.configuration): + if is_windows(ctx.fragments): return ";" else: return ":" @@ -29,7 +29,7 @@ def path_separator(ctx): # production ready. def java_library_impl(ctx): - javac_options = ctx.configuration.fragment(java_configuration).default_javac_flags + javac_options = ctx.fragments.java.default_javac_flags class_jar = ctx.outputs.class_jar compile_time_jars = set(order="link") runtime_jars = set(order="link") diff --git a/tools/build_rules/rust/rust.bzl b/tools/build_rules/rust/rust.bzl index 98af19bfa3..7779ec2d8d 100644 --- a/tools/build_rules/rust/rust.bzl +++ b/tools/build_rules/rust/rust.bzl @@ -123,7 +123,7 @@ def _build_rustc_command(ctx, crate_type, src, output_dir, depinfo, rustlib_path = ctx.files._rustlib[0].dirname # Paths to cc (for linker) and ar - cpp_fragment = ctx.configuration.fragment(cpp) + cpp_fragment = ctx.fragments.cpp cc = cpp_fragment.compiler_executable ar = cpp_fragment.ar_executable # Currently, the CROSSTOOL config for darwin sets ar to "libtool". Because |