Rollback of commit e2239cc.

*** Reason for rollback *** Breaks //nlp/pragma/similarities/learners:abe_test : blaze test -c opt //nlp/pragma/similarities/learners:abe_test See [] *** Original change description *** Expose rpath entries as a build variable -- PiperOrigin-RevId: 146347832 MOS_MIGRATED_REVID=146347832
aovakur · Feb 2, 2017 · b999076 · b999076
1 parent cd8dde7
commit b999076
Show file tree

Hide file tree

Showing 4 changed files with 170 additions and 191 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
@@ -409,12 +409,12 @@ protected CppConfiguration(CppConfigurationParameters params)
 
     this.toolchainIdentifier = toolchain.getToolchainIdentifier();
 
-    this.supportsEmbeddedRuntimes = toolchain.getSupportsEmbeddedRuntimes();
     toolchain = addLegacyFeatures(toolchain);
     this.toolchainFeatures = new CcToolchainFeatures(toolchain);
     this.supportsGoldLinker = toolchain.getSupportsGoldLinker();
     this.supportsStartEndLib = toolchain.getSupportsStartEndLib();
     this.supportsInterfaceSharedObjects = toolchain.getSupportsInterfaceSharedObjects();
+    this.supportsEmbeddedRuntimes = toolchain.getSupportsEmbeddedRuntimes();
     this.supportsFission = toolchain.getSupportsFission();
     this.toolchainNeedsPic = toolchain.getNeedsPic();
     this.usePicForBinaries =
@@ -733,12 +733,12 @@ private CToolchain addLegacyFeatures(CToolchain toolchain) {
           if (getTargetLibc().equals("macosx")) {
             TextFormat.merge(
                 CppLinkActionConfigs.getCppLinkActionConfigs(
-                    CppLinkPlatform.MAC, features, linkerToolPath, supportsEmbeddedRuntimes),
+                    CppLinkPlatform.MAC, features, linkerToolPath),
                 toolchainBuilder);
           } else {
             TextFormat.merge(
                 CppLinkActionConfigs.getCppLinkActionConfigs(
-                    CppLinkPlatform.LINUX, features, linkerToolPath, supportsEmbeddedRuntimes),
+                    CppLinkPlatform.LINUX, features, linkerToolPath),
                 toolchainBuilder);
           }
         }