diff options
| author |  hlopko <hlopko@google.com> | 2018-04-09 06:41:22 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-09 06:43:16 -0700 |
| commit | 4a4be69a997df2ff5951601a697ec8ebf6786ee1 (patch) | |
| tree | 486c936a91b86f477ed57633bf2a5280780c673c /src | |
| parent | 36bac4d8d1883292b81888140244a36cff45944a (diff) | |
Do not create interface shared library when lto indexing
This fixes a bug introduced by https://github.com/bazelbuild/bazel/commit/eba28176a97a0d0ddf2d1ef8505d37f392a2c363. While at it I also brought
output_execpath back to its previous behavior - not exposed for lto indexing.
RELNOTES: None
PiperOrigin-RevId: 192119904
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java index 5975f41ec5..6378640269 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java @@ -164,7 +164,7 @@ public enum LinkBuildVariables { } // output exec path - if (outputArtifact != null) { + if (outputArtifact != null && !isLtoIndexing) { buildVariables.addStringVariable( OUTPUT_EXECPATH.getVariableName(), outputArtifact.getExecPathString()); } @@ -205,7 +205,10 @@ public enum LinkBuildVariables { } } boolean shouldGenerateInterfaceLibrary = - outputArtifact != null && interfaceLibraryBuilder != null && interfaceLibraryOutput != null; + outputArtifact != null + && interfaceLibraryBuilder != null + && interfaceLibraryOutput != null + && !isLtoIndexing; buildVariables.addStringVariable( GENERATE_INTERFACE_LIBRARY.getVariableName(), shouldGenerateInterfaceLibrary ? "yes" : "no"); |