From 90d30e575bea52c4e5eb8db9c9b7e67c6673315d Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Fri, 20 May 2016 14:34:16 +0000 Subject: 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 --- src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java') 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; -- cgit v1.2.3