diff options
| author |  hlopko <hlopko@google.com> | 2018-03-21 10:32:43 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-21 10:34:42 -0700 |
| commit | 961748593f9447ec4f8ff46f14ee4306a5a9574b (patch) | |
| tree | 2d069a6e631d77a5454801bbb9cf196780d2bf4b /src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java | |
| parent | a3ba00e61f81163f90b1edee4a076c7e7d877e4c (diff) | |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java | 6 |
1 files changed, 1 insertions, 5 deletions
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; |