From 961748593f9447ec4f8ff46f14ee4306a5a9574b Mon Sep 17 00:00:00 2001 From: hlopko Date: Wed, 21 Mar 2018 10:32:43 -0700 Subject: Automated rollback of commit 3dab964407a2f1e12feb439d8507079bc06cb769. *** Reason for rollback *** Break bazel ci. *** Original change description *** Assume toolchain supportsDynamicLinker from presence of "dynamic_linking_mode" feature Toolchains no longer have to provide linking_mode_flags { mode: DYNAMIC } to state that they support dynamic linking mode. It is enough to provide a feature. This is part of ongoing work to get rid of linking_mode_flags from the CROSSTOOL. RELNOTES: None. PiperOrigin-RevId: 189928991 --- .../com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java index 03a9f9d674..52bbd59450 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java @@ -320,11 +320,7 @@ public final class CppToolchainInfo { this.supportsFission = supportsFission; this.supportsStartEndLib = supportsStartEndLib; this.supportsEmbeddedRuntimes = supportsEmbeddedRuntimes; - this.supportsDynamicLinker = - supportsDynamicLinker - || toolchainFeatures - .getActivatableNames() - .contains(CppRuleClasses.DYNAMIC_LINKING_MODE); + this.supportsDynamicLinker = supportsDynamicLinker; this.supportsInterfaceSharedObjects = supportsInterfaceSharedObjects; this.supportsGoldLinker = supportsGoldLinker; this.toolchainNeedsPic = toolchainNeedsPic; -- cgit v1.2.3