Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/compiler/compiler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ pub enum Language {
CxxHeader,
CxxPreprocessed,
ObjectiveC,
ObjectiveCHeader,
ObjectiveCPreprocessed,
ObjectiveCxx,
ObjectiveCxxPreprocessed,
Expand Down Expand Up @@ -279,7 +280,7 @@ impl Language {
Language::CxxHeader => "c++Header",
Language::CxxPreprocessed => "c++Preprocessed",
Language::GenericHeader => "c/c++",
Language::ObjectiveC => "objc",
Language::ObjectiveC | Language::ObjectiveCHeader => "objc",
Language::ObjectiveCPreprocessed => "objcPreprocessed",
Language::ObjectiveCxx | Language::ObjectiveCxxHeader => "objc++",
Language::ObjectiveCxxPreprocessed => "objc++Preprocessed",
Expand Down Expand Up @@ -316,6 +317,7 @@ impl Language {
Language::CxxHeader => Some("c++-header"),
Language::CxxPreprocessed => Some("c++-cpp-output"),
Language::ObjectiveC => Some("objective-c"),
Language::ObjectiveCHeader => Some("objective-c-header"),
Language::ObjectiveCPreprocessed => Some("objective-c-cpp-output"),
Language::ObjectiveCxx => Some("objective-c++"),
Language::ObjectiveCxxHeader => Some("objective-c++-header"),
Expand Down Expand Up @@ -355,6 +357,7 @@ impl CompilerKind {
| Language::CxxPreprocessed
| Language::GenericHeader
| Language::ObjectiveC
| Language::ObjectiveCHeader
| Language::ObjectiveCPreprocessed
| Language::ObjectiveCxx
| Language::ObjectiveCxxHeader
Expand Down
37 changes: 37 additions & 0 deletions src/compiler/gcc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -404,13 +404,16 @@ where
| Some(Unhashed(_)) => {}
Some(Language(lang)) => {
language = match lang.to_string_lossy().as_ref() {
// From https://gcc.gnu.org/onlinedocs/gcc/Overall-Options.html
// and https://github.com/llvm/llvm-project/blob/main/clang/include/clang/Driver/Types.def
"assembler" => Some(Language::Assembler),
"assembler-with-cpp" => Some(Language::AssemblerToPreprocess),
"c" => Some(Language::C),
"c-header" => Some(Language::CHeader),
"c++" => Some(Language::Cxx),
"c++-header" => Some(Language::CxxHeader),
"objective-c" => Some(Language::ObjectiveC),
"objective-c-header" => Some(Language::ObjectiveCHeader),
"objective-c++" => Some(Language::ObjectiveCxx),
"objective-c++-header" => Some(Language::ObjectiveCxxHeader),
"cu" => Some(Language::Cuda),
Expand Down Expand Up @@ -1146,6 +1149,40 @@ mod test {
);
}

#[test]
fn test_parse_arguments_objc_header_language() {
let args = stringvec!["-x", "objective-c-header", "-c", "foo.h", "-o", "foo.o"];
let ParsedArguments {
input,
language,
compilation_flag,
outputs,
preprocessor_args,
msvc_show_includes,
common_args,
..
} = match parse_arguments_(args, false) {
CompilerArguments::Ok(args) => args,
o => panic!("Got unexpected parse result: {:?}", o),
};
assert_eq!(Some("foo.h"), input.to_str());
assert_eq!(Language::ObjectiveCHeader, language);
assert_eq!(Some("-c"), compilation_flag.to_str());
assert_map_contains!(
outputs,
(
"obj",
ArtifactDescriptor {
path: "foo.o".into(),
optional: false
}
)
);
assert!(preprocessor_args.is_empty());
assert!(common_args.is_empty());
assert!(!msvc_show_includes);
}

#[test]
fn test_parse_arguments_split_dwarf() {
let args = stringvec!["-gsplit-dwarf", "-c", "foo.cpp", "-o", "foo.o"];
Expand Down
Loading