diff options
| author |  lberki <lberki@google.com> | 2017-10-16 11:25:18 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-10-16 17:48:57 +0200 |
| commit | 22670a4e5abb879ebd5e41294f6aa0960346f4cf (patch) | |
| tree | dc27a2a43eec21fea912a57d1a1d6ba0783a51ae /src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java | |
| parent | 95e41675f94bff0dcec027b5516ae07a045dfbfa (diff) | |
Export apple_host_system_env and target_apple_env through apple_common (as opposed to only through ctx.fragments.apple)
Progress towards #3424.
RELNOTES: None.
PiperOrigin-RevId: 172299240
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index 2208b7a0fb..7a9282e7ce 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -74,6 +74,7 @@ import com.google.devtools.build.lib.rules.apple.ApplePlatform; import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType; import com.google.devtools.build.lib.rules.apple.AppleToolchain; import com.google.devtools.build.lib.rules.apple.XcodeConfig; +import com.google.devtools.build.lib.rules.apple.XcodeConfigProvider; import com.google.devtools.build.lib.rules.cpp.CcToolchain; import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider; import com.google.devtools.build.lib.rules.cpp.CppFileTypes; @@ -1127,7 +1128,8 @@ public abstract class CompilationSupport { ISO_8859_1)); ruleContext.registerAction( ObjcRuleClasses.spawnAppleEnvActionBuilder( - appleConfiguration, appleConfiguration.getSingleArchPlatform()) + XcodeConfigProvider.fromRuleContext(ruleContext), + appleConfiguration.getSingleArchPlatform()) .setMnemonic("DummyPruner") .setExecutable(pruner) .addInput(dummyArchive) @@ -1228,7 +1230,8 @@ public abstract class CompilationSupport { ruleContext.registerAction( ObjcRuleClasses.spawnAppleEnvActionBuilder( - appleConfiguration, appleConfiguration.getSingleArchPlatform()) + XcodeConfigProvider.fromRuleContext(ruleContext), + appleConfiguration.getSingleArchPlatform()) .setMnemonic("ObjcBinarySymbolStrip") .setExecutable(xcrunwrapper(ruleContext)) .addCommandLine(symbolStripCommandLine(stripArgs, binaryToLink, strippedBinary)) |