diff options
| author |  Cal Peyser <cpeyser@google.com> | 2016-11-18 14:43:05 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-11-21 19:33:53 +0000 |
| commit | 3613c776abcef65173f03c5bf1c80d44c0cf352e (patch) | |
| tree | 33da318b663dfd6ffe05379388cacd10d5f23c60 /src/main | |
| parent | 1ff6d480d02ab8189ac12f8fedfbed1222b86a43 (diff) | |
The fully link action in experimental_objc_binary has crosstool inputs.
--
MOS_MIGRATED_REVID=139576152
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java index cd6789d3d1..3e529993c2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java @@ -37,6 +37,7 @@ import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfig import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.VariablesExtension; import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider; import com.google.devtools.build.lib.rules.cpp.CppCompileAction; +import com.google.devtools.build.lib.rules.cpp.CppHelper; import com.google.devtools.build.lib.rules.cpp.CppLinkAction; import com.google.devtools.build.lib.rules.cpp.CppLinkActionBuilder; import com.google.devtools.build.lib.rules.cpp.CppRuleClasses; @@ -147,6 +148,7 @@ public class CrosstoolCompilationSupport extends CompilationSupport { .addActionInputs(objcProvider.getObjcLibraries()) .addActionInputs(objcProvider.getCcLibraries()) .addActionInputs(objcProvider.get(IMPORTED_LIBRARY).toSet()) + .setCrosstoolInputs(CppHelper.getToolchain(ruleContext).getLink()) .setLinkType(LinkTargetType.OBJC_FULLY_LINKED_ARCHIVE) .setLinkStaticness(LinkStaticness.FULLY_STATIC) .setLibraryIdentifier(libraryIdentifier) |