diff options
author | 2015-09-04 16:15:19 +0000 | |
---|---|---|
committer | 2015-09-04 16:33:04 +0000 | |
commit | a708acd02baf3821c975801ae0e5cad6867a6735 (patch) | |
tree | 1be391b7c9fa3df12cdf29412b2abe71f250de95 /src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java | |
parent | d416ffeac5e81630688e31b7925e287354195b60 (diff) |
Teach Bazel to accept assembler-without-preprocessor source files.
Adding the accepted file extensions was a minor issue.
The bulk of this change was to weaken the assertion
that all cxx compiler actions produce a '.d' file.
RELNOTES[NEW]: a cc_binary rule may list '.s' and '.asm' files in the srcs
--
MOS_MIGRATED_REVID=102346882
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java index de1c92ce96..f651f629cc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java @@ -18,6 +18,7 @@ import static com.google.devtools.build.lib.packages.ImplicitOutputsFunction.fro import static com.google.devtools.build.lib.rules.cpp.CppFileTypes.ALWAYS_LINK_LIBRARY; import static com.google.devtools.build.lib.rules.cpp.CppFileTypes.ALWAYS_LINK_PIC_LIBRARY; import static com.google.devtools.build.lib.rules.cpp.CppFileTypes.ARCHIVE; +import static com.google.devtools.build.lib.rules.cpp.CppFileTypes.ASSEMBLER; import static com.google.devtools.build.lib.rules.cpp.CppFileTypes.ASSEMBLER_WITH_C_PREPROCESSOR; import static com.google.devtools.build.lib.rules.cpp.CppFileTypes.CPP_HEADER; import static com.google.devtools.build.lib.rules.cpp.CppFileTypes.CPP_SOURCE; @@ -54,7 +55,8 @@ public class CppRuleClasses { * those. */ static final InstrumentationSpec INSTRUMENTATION_SPEC = new InstrumentationSpec( - FileTypeSet.of(CPP_SOURCE, C_SOURCE, CPP_HEADER, ASSEMBLER_WITH_C_PREPROCESSOR), + FileTypeSet.of(CPP_SOURCE, C_SOURCE, CPP_HEADER, ASSEMBLER_WITH_C_PREPROCESSOR, + ASSEMBLER), "srcs", "deps", "data", "hdrs"); public static final LibraryLanguage LANGUAGE = new LibraryLanguage("C++"); |