aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/cpp
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2018-07-20 07:53:18 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-07-20 07:54:47 -0700
commit3ecc8d603b94ae51f98a1ada241c69ad3ce1d9e5 (patch)
treeafc9cec9e5d4cad6e6858bb5eb2953a04b33f748 /src/main/java/com/google/devtools/build/lib/rules/cpp
parent120b2872287bbbfa8cc870bd0c06c1a4ec6828a5 (diff)
Do not check if features named include_paths or preprocessor_defines
are enabled before setting the corresponding build variables for the crosstool. Such a conditional is unnecessary. RELNOTES: None. PiperOrigin-RevId: 205397072
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java38
1 files changed, 17 insertions, 21 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java
index b0938b83af..f4d750d188 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java
@@ -256,34 +256,30 @@ public enum CompileBuildVariables {
// Module inputs will be set later when the action is executed.
buildVariables.addStringSequenceVariable(MODULE_FILES.getVariableName(), ImmutableSet.of());
}
- if (featureConfiguration.isEnabled(CppRuleClasses.INCLUDE_PATHS)) {
- buildVariables.addStringSequenceVariable(INCLUDE_PATHS.getVariableName(), includeDirs);
- buildVariables.addStringSequenceVariable(
- QUOTE_INCLUDE_PATHS.getVariableName(), quoteIncludeDirs);
- buildVariables.addStringSequenceVariable(
- SYSTEM_INCLUDE_PATHS.getVariableName(), systemIncludeDirs);
- }
+ buildVariables.addStringSequenceVariable(INCLUDE_PATHS.getVariableName(), includeDirs);
+ buildVariables.addStringSequenceVariable(
+ QUOTE_INCLUDE_PATHS.getVariableName(), quoteIncludeDirs);
+ buildVariables.addStringSequenceVariable(
+ SYSTEM_INCLUDE_PATHS.getVariableName(), systemIncludeDirs);
if (!includes.isEmpty()) {
buildVariables.addStringSequenceVariable(INCLUDES.getVariableName(), includes);
}
- if (featureConfiguration.isEnabled(CppRuleClasses.PREPROCESSOR_DEFINES)) {
- Iterable<String> allDefines;
- if (fdoStamp != null) {
- // Stamp FDO builds with FDO subtype string
- allDefines =
- ImmutableList.<String>builder()
- .addAll(defines)
- .add(CppConfiguration.FDO_STAMP_MACRO + "=\"" + fdoStamp + "\"")
- .build();
- } else {
- allDefines = defines;
- }
-
- buildVariables.addStringSequenceVariable(PREPROCESSOR_DEFINES.getVariableName(), allDefines);
+ Iterable<String> allDefines;
+ if (fdoStamp != null) {
+ // Stamp FDO builds with FDO subtype string
+ allDefines =
+ ImmutableList.<String>builder()
+ .addAll(defines)
+ .add(CppConfiguration.FDO_STAMP_MACRO + "=\"" + fdoStamp + "\"")
+ .build();
+ } else {
+ allDefines = defines;
}
+ buildVariables.addStringSequenceVariable(PREPROCESSOR_DEFINES.getVariableName(), allDefines);
+
if (usePic) {
if (!featureConfiguration.isEnabled(CppRuleClasses.PIC)) {
throw new EvalException(Location.BUILTIN, CcCommon.PIC_CONFIGURATION_ERROR);