diff options
| author |  cparsons <cparsons@google.com> | 2017-04-10 21:23:41 +0000 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-04-11 10:50:21 +0200 |
| commit | 0e3381e92ec2060fb3d2fd16d113e065063ccc03 (patch) | |
| tree | d7863bdb656625d4fd1774ca3fd3baed95ddb8ba /src | |
| parent | e129faedc41a2f9481d56c20e3046fcef9568a3b (diff) | |
Use split transition consistently among Apple multi-arch linking rules.
Previously, there was no configuration transition in the default case.
While this was "convenient" for testing, it makes these tests somewhat inconsistent,
and furthermore invalid once these rules switch to always using a configuration transition
with the inclusion of minimum OS as an attribute.
RELNOTES: None.
PiperOrigin-RevId: 152734307
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java index fdf7e2333d..36791eb025 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java @@ -127,6 +127,9 @@ public class MultiArchSplitTransitionProvider implements SplitTransitionProvider switch (platformType) { case IOS: cpus = buildOptions.get(AppleCommandLineOptions.class).iosMultiCpus; + if (cpus.isEmpty()) { + cpus = ImmutableList.of(buildOptions.get(AppleCommandLineOptions.class).iosCpu); + } configurationDistinguisher = ConfigurationDistinguisher.APPLEBIN_IOS; break; case WATCHOS: |