diff options
| author |  cpeyser <cpeyser@google.com> | 2017-10-31 10:07:15 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-10-31 10:40:11 -0400 |
| commit | 58fd82def9ac853c18c25af1f7d7eaed7b2c6ca4 (patch) | |
| tree | d551e49c804d142b0cf19407b38552be6fd0e435 /src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java | |
| parent | 4cad14a353e017868bb6b913564eab1ea7de644e (diff) | |
Move CppConfiguration#toolchainNeedsPic, #getRuntimeSysroot, and
#getSolibDirectory to CcToolchainProvider.
PiperOrigin-RevId: 174032021
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java index 4ae834e254..3fcf418d56 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java @@ -331,9 +331,13 @@ public class CcToolchain implements RuleConfiguredTargetFactory { .getProvider(FileProvider.class).getFilesToBuild()) { if (CppHelper.SHARED_LIBRARY_FILETYPES.matches(artifact.getFilename())) { dynamicRuntimeLinkInputs.add(artifact); - dynamicRuntimeLinkSymlinksBuilder.add(SolibSymlinkAction.getCppRuntimeSymlink( - ruleContext, artifact, runtimeSolibDirBase, - ruleContext.getConfiguration())); + dynamicRuntimeLinkSymlinksBuilder.add( + SolibSymlinkAction.getCppRuntimeSymlink( + ruleContext, + artifact, + toolchainInfo.getSolibDirectory(), + runtimeSolibDirBase, + ruleContext.getConfiguration())); } } dynamicRuntimeLinkSymlinks = dynamicRuntimeLinkSymlinksBuilder.build(); @@ -347,6 +351,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory { ruleContext, purposePrefix + "dynamic_runtime_link", dynamicRuntimeLinkInputs, + toolchainInfo.getSolibDirectory(), runtimeSolibDirBase, ruleContext.getConfiguration()); dynamicRuntimeLinkMiddleman = dynamicRuntimeLinkMiddlemanSet.isEmpty() |