From 2ef4ef41a1f38df3204f02f7f8742fa39daeccce Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Fri, 28 Aug 2015 07:53:32 +0000 Subject: Fix C++ link order for py_library and py_binary rules. -- MOS_MIGRATED_REVID=101756783 --- .../java/com/google/devtools/build/lib/rules/python/PyBinary.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java index 946cf76617..a60e0d7e88 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.analysis.RunfilesSupport; -import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory; import com.google.devtools.build.lib.rules.cpp.CcLinkParams; import com.google.devtools.build.lib.rules.cpp.CcLinkParamsProvider; @@ -124,10 +123,9 @@ public abstract class PyBinary implements RuleConfiguredTargetFactory { @Override protected void collect(CcLinkParams.Builder builder, boolean linkingStatically, boolean linkShared) { - Iterable deps = - ruleContext.getPrerequisites("deps", Mode.TARGET); - builder.addTransitiveTargets(deps); - builder.addTransitiveLangTargets(deps, PyCcLinkParamsProvider.TO_LINK_PARAMS); + builder.addTransitiveTargets(ruleContext.getPrerequisites("deps", Mode.TARGET), + PyCcLinkParamsProvider.TO_LINK_PARAMS, + CcLinkParamsProvider.TO_LINK_PARAMS); } }; } -- cgit v1.2.3