diff options
author | Rumou Duan <rduan@google.com> | 2017-02-10 17:24:03 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2017-02-10 18:19:31 +0000 |
commit | 5490757be5e527df82eee5094a0f59c86a5de766 (patch) | |
tree | 6d75800e0348de7e3472dd37de75d467a65fb468 /src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java | |
parent | 762576e5e7a3ee0da39dbb24134cb8530cbb911e (diff) |
Introduce CppCompileActionTemplate, which expands into a list of CppCompileActions that to be executed at execution time.
--
PiperOrigin-RevId: 147163077
MOS_MIGRATED_REVID=147163077
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java index b22e989734..ffe579062a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java @@ -954,8 +954,11 @@ public class CppLinkActionBuilder { } private void addObjectFile(LinkerInput input) { + // We skip file extension checks for TreeArtifacts because they represent directory artifacts + // without a file extension. String name = input.getArtifact().getFilename(); - Preconditions.checkArgument(Link.OBJECT_FILETYPES.matches(name), name); + Preconditions.checkArgument( + input.getArtifact().isTreeArtifact() || Link.OBJECT_FILETYPES.matches(name), name); this.objectFiles.add(input); } |