diff options
| author |  Googler <noreply@google.com> | 2017-07-19 01:46:30 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-07-19 10:22:41 +0200 |
| commit | 982c751cdad286553833e238e3a0d912076cb84f (patch) | |
| tree | 35cbe63de57314e648176af4041faa9dc3b92cdc /src/main/java/com | |
| parent | 64a0f5664720c2a067483f2ee77caecf17aaca3c (diff) | |
Make the ClifMatchRule produce .d files.
PiperOrigin-RevId: 162422934
Diffstat (limited to 'src/main/java/com')
3 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index cd58be8100..89f82b292d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -685,6 +685,7 @@ public class CppConfiguration extends BuildConfiguration.Fragment { + " action: 'objc++-compile'" + " action: 'c++-header-preprocessing'" + " action: 'c++-header-parsing'" + + " action: 'clif-match'" + " expand_if_all_available: 'dependency_file'" + " flag_group {" + " flag: '-MD'" diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java index 3c7f07f6df..ccb20727da 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java @@ -192,7 +192,6 @@ public final class CppFileTypes { String fileName = source.getFilename(); return !ASSEMBLER.matches(fileName) && !PIC_ASSEMBLER.matches(fileName) - && !CLIF_INPUT_PROTO.matches(fileName) && !CPP_MODULE.matches(fileName); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java index e8b0e2690e..99222ecc6f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java @@ -801,7 +801,7 @@ public final class CppModel { String outputName, Builder result, AnalysisEnvironment env, CppCompileActionBuilder builder) throws RuleErrorException { builder - .setOutputs(ruleContext, ArtifactCategory.CLIF_OUTPUT_PROTO, outputName, false) + .setOutputs(ruleContext, ArtifactCategory.CLIF_OUTPUT_PROTO, outputName, true) .setPicMode(false) // The additional headers in a clif action are both mandatory inputs and // need to be include-scanned. |