Apple-specific environment variables are derived from the CROSSTOOL instead of hardcoded in AppleCcToolchain. Also, apply environment variables to objc archives. -- PiperOrigin-RevId: 149439637 MOS_MIGRATED_REVID=149439637
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java index 3ce8d66..92902bc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java
@@ -63,7 +63,7 @@ Platform platform = appleConfiguration.getSingleArchPlatform(); - Map<String, String> appleEnv = getEnvironment(ruleContext); + Map<String, String> appleEnv = getEnvironmentBuildVariables(ruleContext); return ImmutableMap.<String, String>builder() .put( @@ -114,8 +114,7 @@ .build(); } - @Override - public ImmutableMap<String, String> getEnvironment(RuleContext ruleContext) { + private ImmutableMap<String, String> getEnvironmentBuildVariables(RuleContext ruleContext) { Map<String, String> builder = new LinkedHashMap<>(); CppConfiguration cppConfiguration = ruleContext.getFragment(CppConfiguration.class); AppleConfiguration appleConfiguration = ruleContext.getFragment(AppleConfiguration.class);