diff options
| author |  jmmv <jmmv@google.com> | 2017-03-30 20:25:48 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-03-31 17:11:12 +0200 |
| commit | 1520edbba81f3c61723be0ac792601d0299fa5f8 (patch) | |
| tree | 9c01a0512f5995cb771a8634042747e45aa9a545 /src/main/java/com/google/devtools/build/lib/rules/apple/cpp | |
| parent | 833fd12fd86ddc32e89b1b0cff57b248a58dc8ab (diff) | |
Automated g4 rollback of commit 05300b5945286f6063afbf1d16c9c8e5621c4828.
*** Reason for rollback ***
Breaks inclusion of C++ system headers.
*** Original change description ***
Extract --sysroot flag from blaze and move it into crosstool
RELNOTES: None.
PiperOrigin-RevId: 151742077
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/apple/cpp')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 de55d33b12..92902bcac7 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 @@ -53,7 +53,7 @@ public class AppleCcToolchain extends CcToolchain { public static final String APPLE_SDK_PLATFORM_VALUE_KEY = "apple_sdk_platform_value"; @Override - protected Map<String, String> getLocalBuildVariables(RuleContext ruleContext) + protected Map<String, String> getBuildVariables(RuleContext ruleContext) throws RuleErrorException { AppleConfiguration appleConfiguration = ruleContext.getFragment(AppleConfiguration.class); |