diff options
| author |  Lukacs Berki <lberki@google.com> | 2016-05-20 12:34:48 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2016-05-20 14:42:02 +0000 |
| commit | c169a0ae0899cabf9fa7f3a3cbd7f9c4520fbd3d (patch) | |
| tree | 6e4ee9254c03c1756a1f1a892f901d38f480a4e0 /src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java | |
| parent | a4c7d25d219e8d748c18f8c49d1366fa1d683ab7 (diff) | |
Rollback of commit 7841a6ab100fc35a67600f1ce1a70d293c51350e.
*** Reason for rollback ***
breaks []
*** Original change description ***
Move the command line arguments for C++ preprocessor defines to a feature.
This required a few assorted changes:
- The LIPO compilation context is not merged anymore. Include paths for auxiliary files are apparently taken from the profile files, so it is not necessary.
- 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. Th...
***
--
MOS_MIGRATED_REVID=122823591
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.java | 3 |
1 files changed, 1 insertions, 2 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 6ac68d579f..e77bef91b4 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,8 +87,7 @@ public final class CcCommon { CppRuleClasses.MODULE_MAP_HOME_CWD, CppRuleClasses.HEADER_MODULE_INCLUDES_DEPENDENCIES, CppRuleClasses.INCLUDE_PATHS, - CppRuleClasses.PIC, - CppRuleClasses.PREPROCESSOR_DEFINES); + CppRuleClasses.PIC); /** C++ configuration */ private final CppConfiguration cppConfiguration; |