diff options
author | 2018-03-22 07:10:09 -0700 | |
---|---|---|
committer | 2018-03-22 07:11:36 -0700 | |
commit | d01e8ad9acb2f30e91a653d3af00bd0302c44ad5 (patch) | |
tree | 23e1d70fef1e458d7844b269bfae4fdd4a41c43c /src/main/java/com/google/devtools/build | |
parent | 5655c7fab3a5cdcd149db66d00a9ccda3702de59 (diff) |
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.
This is rollforward of https://github.com/bazelbuild/bazel/commit/3dab964407a2f1e12feb439d8507079bc06cb769.
RELNOTES: None.
PiperOrigin-RevId: 190059334
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java | 6 |
1 files changed, 5 insertions, 1 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 52bbd59450..03a9f9d674 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,7 +320,11 @@ public final class CppToolchainInfo { this.supportsFission = supportsFission; this.supportsStartEndLib = supportsStartEndLib; this.supportsEmbeddedRuntimes = supportsEmbeddedRuntimes; - this.supportsDynamicLinker = supportsDynamicLinker; + this.supportsDynamicLinker = + supportsDynamicLinker + || toolchainFeatures + .getActivatableNames() + .contains(CppRuleClasses.DYNAMIC_LINKING_MODE); this.supportsInterfaceSharedObjects = supportsInterfaceSharedObjects; this.supportsGoldLinker = supportsGoldLinker; this.toolchainNeedsPic = toolchainNeedsPic; |