From 69ab1a91ef0d6f5424ce01eaf8acc15fa429f4bb Mon Sep 17 00:00:00 2001 From: Cal Peyser Date: Mon, 30 Jan 2017 17:08:10 +0000 Subject: When the apple crosstool transition is being used (set with --apple_crosstool_transition), the APPLE_CROSSTOOL distinguisher does not modify output directory. -- PiperOrigin-RevId: 145999133 MOS_MIGRATED_REVID=145999133 --- .../devtools/build/lib/rules/apple/AppleConfiguration.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build') diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java index 4b938ea39e..432c405741 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java @@ -531,6 +531,16 @@ public class AppleConfiguration extends BuildConfiguration.Fragment { return configurationDistinguisher; } + private boolean shouldDistinguishOutputDirectory() { + if (configurationDistinguisher == ConfigurationDistinguisher.UNKNOWN) { + return false; + } else if (configurationDistinguisher == ConfigurationDistinguisher.APPLE_CROSSTOOL + && isAppleCrosstoolEnabled()) { + return false; + } else { + return true; + } + } @Nullable @Override @@ -540,7 +550,7 @@ public class AppleConfiguration extends BuildConfiguration.Fragment { components.add(applePlatformType.toString().toLowerCase()); components.add(appleSplitCpu); } - if (configurationDistinguisher != ConfigurationDistinguisher.UNKNOWN) { + if (shouldDistinguishOutputDirectory()) { components.add(configurationDistinguisher.getFileSystemName()); } -- cgit v1.2.3