diff options
| author |  cpeyser <cpeyser@google.com> | 2017-10-16 16:08:20 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-10-16 17:49:07 +0200 |
| commit | 9f777bbe0d5a41e118d826ea2156b702ad5a4a72 (patch) | |
| tree | c268eb596cde3161d40e6958df27977630db2972 /src/main/java/com/google/devtools/build/lib/rules | |
| parent | b62f717cbad93a1204a77f7179aaf663037fbfce (diff) | |
In CppToolchainInfo, use the label of the cc_toolchain instead of --crosstool_top to find the crosstool package.
PiperOrigin-RevId: 172320513
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java index 3283d815f9..8619c79fed 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java @@ -377,7 +377,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory { new CppToolchainInfo( toolchain, cppConfiguration.getCrosstoolTopPathFragment(), - cppConfiguration.getCrosstoolTop()); + cppConfiguration.getCcToolchainRuleLabel()); } catch (InvalidConfigurationException e) { ruleContext.throwWithRuleError(e.getMessage()); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java index 1c799e009f..754bf48605 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java @@ -99,7 +99,7 @@ public final class CppToolchainInfo { /** Creates a CppToolchainInfo from a toolchain. */ public CppToolchainInfo( - CToolchain cToolchain, PathFragment crosstoolTopPathFragment, Label crosstoolTop) + CToolchain cToolchain, PathFragment crosstoolTopPathFragment, Label toolchainLabel) throws InvalidConfigurationException { CToolchain toolchain = cToolchain; this.crosstoolTopPathFragment = crosstoolTopPathFragment; @@ -112,12 +112,12 @@ public final class CppToolchainInfo { try { this.staticRuntimeLibsLabel = - crosstoolTop.getRelative( + toolchainLabel.getRelative( toolchain.hasStaticRuntimesFilegroup() ? toolchain.getStaticRuntimesFilegroup() : "static-runtime-libs-" + targetCpu); this.dynamicRuntimeLibsLabel = - crosstoolTop.getRelative( + toolchainLabel.getRelative( toolchain.hasDynamicRuntimesFilegroup() ? toolchain.getDynamicRuntimesFilegroup() : "dynamic-runtime-libs-" + targetCpu); |