aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/nativedeps
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/nativedeps')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java b/src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java
index 5121bd1752..d8ddf994d9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java
@@ -234,15 +234,11 @@ public abstract class NativeDepsHelper {
featureConfiguration,
cppSemantics);
if (useDynamicRuntime) {
- builder.setRuntimeInputs(
- ArtifactCategory.DYNAMIC_LIBRARY,
- toolchain.getDynamicRuntimeLinkMiddleman(featureConfiguration),
- toolchain.getDynamicRuntimeLinkInputs(featureConfiguration));
+ builder.setRuntimeInputs(ArtifactCategory.DYNAMIC_LIBRARY,
+ toolchain.getDynamicRuntimeLinkMiddleman(), toolchain.getDynamicRuntimeLinkInputs());
} else {
- builder.setRuntimeInputs(
- ArtifactCategory.STATIC_LIBRARY,
- toolchain.getStaticRuntimeLinkMiddleman(featureConfiguration),
- toolchain.getStaticRuntimeLinkInputs(featureConfiguration));
+ builder.setRuntimeInputs(ArtifactCategory.STATIC_LIBRARY,
+ toolchain.getStaticRuntimeLinkMiddleman(), toolchain.getStaticRuntimeLinkInputs());
}
ImmutableMap.Builder<Artifact, Artifact> ltoBitcodeFilesMap = new ImmutableMap.Builder<>();
for (LibraryToLink lib : linkerInputs) {
@@ -292,8 +288,7 @@ public abstract class NativeDepsHelper {
List<Artifact> runtimeSymlinks;
if (useDynamicRuntime) {
runtimeSymlinks = new LinkedList<>();
- for (final Artifact runtimeInput :
- toolchain.getDynamicRuntimeLinkInputs(featureConfiguration)) {
+ for (final Artifact runtimeInput : toolchain.getDynamicRuntimeLinkInputs()) {
final Artifact runtimeSymlink =
ruleContext.getPackageRelativeArtifact(
getRuntimeLibraryPath(ruleContext, runtimeInput), bindirIfShared);