diff options
| author |  Chris Parsons <cparsons@google.com> | 2015-11-18 22:39:48 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-11-19 10:04:30 +0000 |
| commit | 181010eeb9535003cc934050a89fa76700f7e60e (patch) | |
| tree | 4d48f490f5cdd4977bca7bf7be106d3415707ff9 /src/main/java/com/google/devtools/build/lib/bazel/rules/cpp | |
| parent | 6f09a5d5e4b9b7b508542a5d62d961e3a077868e (diff) | |
Propagate apple platform environment variables for CppCompileAction
--
MOS_MIGRATED_REVID=108182745
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/bazel/rules/cpp')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java index e4268a2976..bddfc81a53 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java @@ -59,6 +59,7 @@ import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; import com.google.devtools.build.lib.packages.TriState; +import com.google.devtools.build.lib.rules.apple.AppleConfiguration; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; import com.google.devtools.build.lib.rules.cpp.CppFileTypes; import com.google.devtools.build.lib.rules.cpp.CppRuleClasses; @@ -609,7 +610,7 @@ public class BazelCppRuleClasses { @Override public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { return builder - .requiresConfigurationFragments(CppConfiguration.class) + .requiresConfigurationFragments(CppConfiguration.class, AppleConfiguration.class) /*<!-- #BLAZE_RULE(cc_binary).IMPLICIT_OUTPUTS --> <ul> <li><code><var>name</var>.stripped</code> (only built if explicitly requested): A stripped @@ -755,7 +756,7 @@ public class BazelCppRuleClasses { // TODO: Google cc_library overrides documentation for: // deps, data, linkopts, defines, srcs; override here too? - .requiresConfigurationFragments(CppConfiguration.class) + .requiresConfigurationFragments(CppConfiguration.class, AppleConfiguration.class) /*<!-- #BLAZE_RULE(cc_library).ATTRIBUTE(alwayslink) --> If 1, any binary that depends (directly or indirectly) on this C++ library will link in all the object files for the files listed in |