commit f64267fd947697649b45efeab04c241584b549cb
author Jan Niklas Hasse <jhasse@bixense.com> Mon Sep 25 12:41:00 2023 +0200
committer GitHub <noreply@github.com> Mon Sep 25 12:41:00 2023 +0200
tree 4cc4fa9c03e17a88f65a0eebdb514424e21a6be0
parent 08cfea52fcd535d32bbca6abf893164c8bb2f7e9
parent eddafdd7e733241f92900035953f6bcf7c7677e3

Merge pull request #2329 from digit-google/fix-mingw-compilation

Fix Mingw cross-compilation.

src/ninja.cc

diff --git a/src/ninja.cc b/src/ninja.cc
index 887d89f..39672c3 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -882,7 +882,10 @@
     return command;
 
   size_t index = command.find(rspfile);
-  if (index == 0 || index == string::npos || command[index - 1] != '@')
+  if (index == 0 || index == string::npos ||
+      (command[index - 1] != '@' &&
+       command.find("--option-file=") != index - 14 &&
+       command.find("-f ") != index - 3))
     return command;
 
   string rspfile_content = edge->GetBinding("rspfile_content");
@@ -892,7 +895,13 @@
     rspfile_content.replace(newline_index, 1, 1, ' ');
     ++newline_index;
   }
-  command.replace(index - 1, rspfile.length() + 1, rspfile_content);
+  if (command[index - 1] == '@') {
+    command.replace(index - 1, rspfile.length() + 1, rspfile_content);
+  } else if (command.find("-f ") == index - 3) {
+    command.replace(index - 3, rspfile.length() + 3, rspfile_content);
+  } else {  // --option-file syntax
+    command.replace(index - 14, rspfile.length() + 14, rspfile_content);
+  }
   return command;
 }