feat: Support .bat and .cmd scripts as the compiler on Windows (#1546)

diff --git a/src/ccache/execute.cpp b/src/ccache/execute.cpp
index ce529ac230ee1e3873ba26d71d7f08f0ada0ac11..d9d222e4fb2e63e279a294e2019c87880e383ebe 100644 (file)
--- a/src/ccache/execute.cpp
+++ b/src/ccache/execute.cpp
@@ -244,7 +244,7 @@ win32execute(const char* path,
     tmp_file_path = tmp_file.path;
     LOG("Arguments from {}", tmp_file.path);
   }
-  BOOL ret = CreateProcess(full_path.c_str(),
+  BOOL ret = CreateProcess(nullptr,
                            const_cast<char*>(args.c_str()),
                            nullptr,
                            nullptr,

diff --git a/src/ccache/util/path.cpp b/src/ccache/util/path.cpp
index f23db8a05c19b794675699fc92a990000532b279..6c3376c3e3ead7e55c6d646f80f224ac1d66c902 100644 (file)
--- a/src/ccache/util/path.cpp
+++ b/src/ccache/util/path.cpp
@@ -37,7 +37,7 @@ std::string
 add_exe_suffix(const std::string& program)
 {
   std::string ext = util::to_lowercase(fs::path(program).extension().string());
-  if (ext == ".exe" || ext == ".bat" || ext == ".sh") {
+  if (ext == ".exe" || ext == ".bat" || ext == ".cmd" || ext == ".sh") {
     return program;
   } else {
     return program + ".exe";

diff --git a/src/ccache/util/path.hpp b/src/ccache/util/path.hpp
index 3ede6224a9078f66b9d41ff439c6a24df35e188c..fe850ef4ff1e0041b429115b6b9bbfad2c184d13 100644 (file)
--- a/src/ccache/util/path.hpp
+++ b/src/ccache/util/path.hpp
@@ -31,8 +31,8 @@ namespace util {
 
 // --- Interface ---
 
-// Add ".exe" suffix to `program` if it doesn't already end with ".exe", ".bat"
-// or ".sh".
+// Add ".exe" suffix to `program` if it doesn't already end with ".exe", ".bat",
+// ".cmd" or ".sh".
 std::string add_exe_suffix(const std::string& program);
 
 // Return a new path with `extension` added to `path` (keeping any existing