Automated g4 rollback of commit 6879d7ceff0e118fdecb0cabe5134979030b7cb8.

*** Reason for rollback ***

Fixes memory issue that caused this CL to be rolled back.

*** Original change description ***

Automated g4 rollback of commit cbbb423663b154d82e3dfa5e9a56839583987999.

*** Reason for rollback ***

Need to roll this back as part of http://b/38171368

*** Original change description ***

RELNOTES: Effectively remove sysroot from CppConfiguration and allow it to use select statements.
PiperOrigin-RevId: 155651879

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
index 0c640ff818..18d7102092 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
@@ -813,7 +813,7 @@ public class CppLinkActionBuilder {
     } else if (isLTOIndexing && allLTOArtifacts != null) {
       for (LTOBackendArtifacts a : allLTOArtifacts) {
         List<String> argv = new ArrayList<>();
-        argv.addAll(cppConfiguration.getLinkOptions());
+        argv.addAll(toolchain.getLinkOptions());
         argv.addAll(cppConfiguration.getCompilerOptions(features));
         a.setCommandLine(argv);
 
@@ -914,7 +914,7 @@ public class CppLinkActionBuilder {
     boolean sharedLinkopts =
         type == LinkTargetType.DYNAMIC_LIBRARY
             || linkopts.contains("-shared")
-            || cppConfig.getLinkOptions().contains("-shared");
+            || cppConfig.hasSharedLinkOption();
     return (isNativeDeps || cppConfig.legacyWholeArchive())
         && (fullyStatic || mostlyStatic)
         && sharedLinkopts;