diff options
author | hlopko <hlopko@google.com> | 2018-06-21 04:15:59 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-21 04:18:09 -0700 |
commit | dc986d290bad8a76d3429f73c8244376b4c59494 (patch) | |
tree | 06adeb7a664970896eb4e4b781fd8764cab2e865 /src/main/java/com/google | |
parent | c97082475fc2b60251dc19d8882b668f1547b9b7 (diff) |
Add binfiles to quoted include directories for C++ compilation
The only non-deprecated way to declare new files in Skylark is using ctx.actions
(https://docs.bazel.build/versions/master/skylark/lib/actions.html). And these
files are created in binfiles (there is one way to generate a file in Skylark in
genfiles: a rule can be tagget with 'output_to_genfiles = True'
attribute, but that forces all files of all actions in the rule to be generated
in genfiles. And this attribtue is deprecated).
Similarly, https://github.com/bazelbuild/bazel/commit/6c2f499b21e36c59d7da5e8b2e6c9b1804a36c64 added binfiles for <> includes when using
cc_library.includes attribute.
RELNOTES: None.
PiperOrigin-RevId: 201504199
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java index 30d0949419..149e5bfb29 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java @@ -943,6 +943,8 @@ public final class CcCompilationHelper { ccCompilationContextBuilder.addQuoteIncludeDir(repositoryPath); ccCompilationContextBuilder.addQuoteIncludeDir( ruleContext.getConfiguration().getGenfilesFragment().getRelative(repositoryPath)); + ccCompilationContextBuilder.addQuoteIncludeDir( + ruleContext.getConfiguration().getBinFragment().getRelative(repositoryPath)); for (PathFragment systemIncludeDir : systemIncludeDirs) { ccCompilationContextBuilder.addSystemIncludeDir(systemIncludeDir); |