From c780d63ca2ded5bc7e62e7305339c3edcae06bf7 Mon Sep 17 00:00:00 2001 From: Cal Peyser Date: Fri, 12 Aug 2016 17:29:16 +0000 Subject: Add copts and objccopts to experimental_objc_library. -- MOS_MIGRATED_REVID=130114142 --- .../com/google/devtools/build/lib/rules/objc/CompilationSupport.java | 2 +- .../google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 getCompileRuleCopts() { + Iterable getCompileRuleCopts() { List 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)); -- cgit v1.2.3