From cf40c3d90f542a3920bd2fcfbf9943953d5a287b Mon Sep 17 00:00:00 2001 From: Rumou Duan Date: Thu, 2 Feb 2017 22:54:54 +0000 Subject: Fixing Blaze crashing when using --experimental_objc_crosstool=all with objc_proto_library and objc_import rules. -- PiperOrigin-RevId: 146410669 MOS_MIGRATED_REVID=146410669 --- .../google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java index 64070dbac4..09c2e11ff0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java @@ -33,6 +33,7 @@ import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; +import com.google.devtools.build.lib.rules.cpp.CppConfiguration; import com.google.devtools.build.lib.rules.proto.ProtoSourceFileBlacklist; import com.google.devtools.build.lib.util.FileType; @@ -65,7 +66,8 @@ public class ObjcProtoLibraryRule implements RuleDefinition { @Override public RuleClass build(Builder builder, final RuleDefinitionEnvironment env) { return builder - .requiresConfigurationFragments(ObjcConfiguration.class, AppleConfiguration.class) + .requiresConfigurationFragments( + CppConfiguration.class, ObjcConfiguration.class, AppleConfiguration.class) /* The directly depended upon proto_library rules. */ @@ -157,7 +159,7 @@ public class ObjcProtoLibraryRule implements RuleDefinition { .name("objc_proto_library") .factoryClass(ObjcProtoLibrary.class) .ancestors(BaseRuleClasses.RuleBase.class, ObjcRuleClasses.LibtoolRule.class, - ObjcRuleClasses.XcrunRule.class) + ObjcRuleClasses.XcrunRule.class, ObjcRuleClasses.CrosstoolRule.class) .build(); } } -- cgit v1.2.3