@@ -443,10 +443,42 @@ fn build_tree_sitter_library(
443 .arg(header_path)
443 .arg(header_path)
444 .arg("/Od")
444 .arg("/Od")
445 .arg("/utf-8")
445 .arg("/utf-8")
447 .arg("/std:c11");
446 .arg("/std:c11");
448 if let Some(scanner_path) = scanner_path.as_ref() {
447 if let Some(scanner_path) = scanner_path.as_ref() {
448+ if scanner_path.extension() == Some("c".as_ref()) {
449− command.arg(scanner_path);
449+ command.arg(scanner_path);
451+ let mut cpp_command = Command::new(compiler.path());
452+ cpp_command.current_dir(src_path);
453+ for (key, value) in compiler.env() {
454+ cpp_command.env(key, value);
456+ cpp_command.args(compiler.args());
458+ library_path.with_file_name(format!("{}_scanner.o", &grammar.grammar_id));
460+ .args(["/nologo", "/LD", "/I"])
469+ let output = cpp_command
471+ .context("Failed to execute C++ compiler")?;
472+ if !output.status.success() {
474+ "Parser compilation failed.\nStdout: {}\nStderr: {}",
475+ String::from_utf8_lossy(&output.stdout),
476+ String::from_utf8_lossy(&output.stderr)
479+ command.arg(&object_file);
480+ _path_guard = TempPath::from_path(object_file);