aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
diff options
context:
space:
mode:
authorGravatar Lukacs Berki <lberki@google.com>2016-05-20 14:34:16 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2016-05-20 14:42:50 +0000
commit90d30e575bea52c4e5eb8db9c9b7e67c6673315d (patch)
tree9d8b3f7cd78f652b6199dbf3fe269ed73aaa038e /src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
parentd5512bf8cfbf7a13bcedec691f5cc5d5b6d0a7c5 (diff)
Move the command line arguments for C++ preprocessor defines to a feature.
This required a few assorted changes: - The FDO build stamp is not special-cased anymore, it is treated as a preprocessor define like any other. - When compiling a .pcm file, use interfaceContext instead of the regular context when setting up the build variables. This is a bit more consistent and would be a good cause for a future bug. This is a retry of commit 7841a6ab100fc35a67600f1ce1a70d293c51350e, which made some bold changes to LIPO that didn't work out well. -- MOS_MIGRATED_REVID=122829825
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
index e77bef91b4..6ac68d579f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -87,7 +87,8 @@ public final class CcCommon {
CppRuleClasses.MODULE_MAP_HOME_CWD,
CppRuleClasses.HEADER_MODULE_INCLUDES_DEPENDENCIES,
CppRuleClasses.INCLUDE_PATHS,
- CppRuleClasses.PIC);
+ CppRuleClasses.PIC,
+ CppRuleClasses.PREPROCESSOR_DEFINES);
/** C++ configuration */
private final CppConfiguration cppConfiguration;