diff options
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java | 4 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index 65b483e462..c9085971c9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -328,7 +328,7 @@ public class CppConfiguration extends BuildConfiguration.Fragment { private final ImmutableMap<String, String> commandLineDefines; private final String solibDirectory; private final CompilationMode compilationMode; - private final Path execRoot; + /** * If true, the ConfiguredTarget is only used to get the necessary cross-referenced * CppCompilationContexts, but registering build actions is disabled. @@ -349,7 +349,7 @@ public class CppConfiguration extends BuildConfiguration.Fragment { this.ccToolchainLabel = params.ccToolchainLabel; this.compilationMode = params.commonOptions.compilationMode; this.lipoContextCollector = cppOptions.lipoCollector; - this.execRoot = params.execRoot; + this.crosstoolTopPathFragment = crosstoolTop.getPackageIdentifier().getPathFragment(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java index 683e3d6c96..e5097f08d4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java @@ -94,13 +94,11 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory { protected final Label crosstoolTop; protected final Label ccToolchainLabel; protected final Path fdoZip; - protected final Path execRoot; CppConfigurationParameters(CrosstoolConfig.CToolchain toolchain, String cacheKeySuffix, BuildOptions buildOptions, Path fdoZip, - Path execRoot, Label crosstoolTop, Label ccToolchainLabel) { this.toolchain = toolchain; @@ -108,7 +106,6 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory { this.commonOptions = buildOptions.get(BuildConfiguration.Options.class); this.cppOptions = buildOptions.get(CppOptions.class); this.fdoZip = fdoZip; - this.execRoot = execRoot; this.crosstoolTop = crosstoolTop; this.ccToolchainLabel = ccToolchainLabel; } @@ -217,6 +214,6 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory { } return new CppConfigurationParameters(toolchain, file.getMd5(), options, - fdoZip, directories.getExecRoot(), crosstoolTopLabel, ccToolchainLabel); + fdoZip, crosstoolTopLabel, ccToolchainLabel); } } |