diff options
author | hlopko <hlopko@google.com> | 2018-04-24 00:53:06 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-04-24 00:54:45 -0700 |
commit | 44ae7946052f3a6c4c1042e6b97854fe4c13e626 (patch) | |
tree | 98f713f1752bc368b323bd2071bfc276979fbe9b /src/test/java/com/google/devtools/build | |
parent | 9c5c19d48b727e3da65abd7b9b0aa85e892795e2 (diff) |
Cleanup LibraryToLinkCollector to properly distinguish C++ runtimes from dynamic libraries
Term runtime input had 2 meanings in CppLinkAction:
1) input needed at runtime - dynamic library
2) input corresponding to the C++ runtime (libstdc++ or libc++)
This confused me and therefore the code :) This cl cleans this up to some extent by:
* renaming runtimeInput to runtimesInput, to at least give the reader a chance to catch the difference :)
* treating runtimesInputs as normal linker inputs, also downstream in CppLinkAction and LinkCommandLine
* Simplifying LibrariesToLinkCollector by removing explicit runtimesHandling.
RELNOTES: None
PiperOrigin-RevId: 194046439
Diffstat (limited to 'src/test/java/com/google/devtools/build')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java index beb473470b..83ed1d76ce 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java @@ -334,7 +334,7 @@ public class CppLinkActionTest extends BuildViewTestCase { builder.setUseTestOnlyFlags( attributesToFlip.contains(NonStaticAttributes.USE_TEST_ONLY_FLAGS)); builder.setFake(attributesToFlip.contains(NonStaticAttributes.FAKE)); - builder.setRuntimeSolibDir( + builder.setToolchainLibrariesSolibDir( attributesToFlip.contains(NonStaticAttributes.RUNTIME_SOLIB_DIR) ? null : PathFragment.create("so1")); |