diff options
author | Cal Peyser <cpeyser@google.com> | 2016-08-12 17:29:16 +0000 |
---|---|---|
committer | Philipp Wollermann <philwo@google.com> | 2016-08-16 15:20:00 +0000 |
commit | c780d63ca2ded5bc7e62e7305339c3edcae06bf7 (patch) | |
tree | 33b8f358e2b12482bbcfd030ecbb1f5348ade2c3 /src/main/java/com/google/devtools | |
parent | 56e64460c586f5b69cffc99d1f52152a6a47cfbc (diff) |
Add copts and objccopts to experimental_objc_library.
--
MOS_MIGRATED_REVID=130114142
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index 3aa555bc48..102b018802 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -761,7 +761,7 @@ public final class CompilationSupport { * Returns the copts for the compile action in the current rule context (using a combination * of the rule's "copts" attribute as well as the current configuration copts). */ - private Iterable<String> getCompileRuleCopts() { + Iterable<String> getCompileRuleCopts() { List<String> copts = Lists.newArrayList( Iterables.concat(objcConfiguration.getCopts(), attributes.copts())); diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java index de4f34d7aa..f4e8652fe4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java @@ -177,6 +177,7 @@ public class ExperimentalObjcLibrary implements RuleConfiguredTargetFactory { .addPublicHeaders(publicHdrs) .addPrecompiledFiles(precompiledFiles) .addDeps(ruleContext.getPrerequisites("deps", Mode.TARGET)) + .addCopts(compilationSupport.getCompileRuleCopts()) .addVariableExtension( new ObjcVariablesExtension( ruleContext, common.getObjcProvider(), compilationArtifacts)); |