From 303e5bf9ae55dcb494b27d53a2bee30855d38949 Mon Sep 17 00:00:00 2001 From: Cal Peyser Date: Wed, 21 Dec 2016 17:57:36 +0000 Subject: Introduce --apple_crosstool_top, which sets the crosstool for sources in objc_*/apple_*/ios_* targets and their dependencies. -- PiperOrigin-RevId: 142673622 MOS_MIGRATED_REVID=142673622 --- .../google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java index c2f45b5cd0..7dc9e6800a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java @@ -251,7 +251,8 @@ public class ObjcCommandLineOptions extends FragmentOptions { public List> getPotentialSplitTransitions() { return ImmutableList.>builder().add( IosApplication.SPLIT_ARCH_TRANSITION, IosExtension.MINIMUM_OS_AND_SPLIT_ARCH_TRANSITION, - AppleWatch1Extension.MINIMUM_OS_AND_SPLIT_ARCH_TRANSITION) + AppleWatch1Extension.MINIMUM_OS_AND_SPLIT_ARCH_TRANSITION, + AppleCrosstoolTransition.APPLE_CROSSTOOL_TRANSITION) .addAll(MultiArchSplitTransitionProvider.getPotentialSplitTransitions()) .build(); } -- cgit v1.2.3