diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java index 7bd76742af..4ce49c74b4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java @@ -1268,9 +1268,7 @@ public final class CppModel { SolibSymlinkAction.getDynamicLibrarySoname(soImpl.getRootRelativePath(), false)); } - // Should we also link in any libraries that this library depends on? - // That is required on some systems... - CppLinkActionBuilder linkActionBuilder = + CppLinkActionBuilder dynamicLinkActionBuilder = newLinkActionBuilder(soImpl) .setInterfaceOutput(soInterface) .addObjectFiles(ccOutputs.getObjectFiles(usePicForSharedLibs)) @@ -1290,29 +1288,29 @@ public final class CppModel { if (!ccOutputs.getLtoBitcodeFiles().isEmpty() && featureConfiguration.isEnabled(CppRuleClasses.THIN_LTO)) { - linkActionBuilder.setLtoIndexing(true); - linkActionBuilder.setUsePicForLtoBackendActions(usePicForSharedLibs); + dynamicLinkActionBuilder.setLtoIndexing(true); + dynamicLinkActionBuilder.setUsePicForLtoBackendActions(usePicForSharedLibs); // If support is ever added for generating a dwp file for shared // library targets (e.g. when linkstatic=0), then this should change // to generate dwo files when cppConfiguration.useFission(), // and the dwp generating action for the shared library should // include all of the resulting dwo files. - linkActionBuilder.setUseFissionForLtoBackendActions(false); - CppLinkAction indexAction = linkActionBuilder.build(); + dynamicLinkActionBuilder.setUseFissionForLtoBackendActions(false); + CppLinkAction indexAction = dynamicLinkActionBuilder.build(); env.registerAction(indexAction); - linkActionBuilder.setLtoIndexing(false); + dynamicLinkActionBuilder.setLtoIndexing(false); } - CppLinkAction action = linkActionBuilder.build(); - env.registerAction(action); + CppLinkAction dynamicLinkAction = dynamicLinkActionBuilder.build(); + env.registerAction(dynamicLinkAction); if (linkType == LinkTargetType.EXECUTABLE) { return result.build(); } - LibraryToLink dynamicLibrary = action.getOutputLibrary(); - LibraryToLink interfaceLibrary = action.getInterfaceOutputLibrary(); + LibraryToLink dynamicLibrary = dynamicLinkAction.getOutputLibrary(); + LibraryToLink interfaceLibrary = dynamicLinkAction.getInterfaceOutputLibrary(); if (interfaceLibrary == null) { interfaceLibrary = dynamicLibrary; } |