diff options
| author |  philwo <philwo@google.com> | 2017-09-15 11:10:32 +0200 |
|---|---|---|
| committer | Philipp Wollermann <philwo@google.com> | 2017-09-15 11:29:37 +0200 |
| commit | bf96c50e0c9afd3da8d937948c3636f09a0e80d7 (patch) | |
| tree | 56cfb9431cb1321ef87b256caee9690568ef0ea1 /src/main/java/com/google/devtools/build | |
| parent | b0b904839b71f2c147a2d04f4e014b687690dd10 (diff) | |
Automated rollback of commit ca216f5eb4b1f1892219db0f578495bbbdbaa875.
*** Reason for rollback ***
Breaks Bazel building itself on FreeBSD, also #3739.
*** Original change description ***
Introduce empty "toolchain_category" rule for labels that will be used as
categories of toolchains for the purpose of toolchain selection.
Up to now, we've used the native toolchain_type rule for this purpose. That rule depends on a number of configuration fragments that supply build variables - we don't want toolchains to need to depend on those fragments as well. E.g. toolchain_type depends on JvmConfiguration, but we would like toolchains to work with --experimental_disable_jvm.
PiperOrigin-RevId: 168810566
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java index da85efa79e..981adddf95 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java @@ -89,7 +89,7 @@ public class CppHelper { /** Returns label used to select resolved cc_toolchain instances based on platform. */ public static Label getCcToolchainType(String toolsRepository) { - return Label.parseAbsoluteUnchecked(toolsRepository + "//tools/cpp:toolchain_category"); + return Label.parseAbsoluteUnchecked(toolsRepository + "//tools/cpp:toolchain_type"); } private CppHelper() { |