Adapt for changes in how the 'cc' crate invokes 'lib.exe' and 'cl.exe'

piscisaureus · Aug 22, 2019 · 540a91e · 540a91e
1 parent e276e6e
commit 540a91e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/gen.js b/gen.js
@@ -1172,19 +1172,19 @@ function parseLibArgs([...args], cwd) {
   let argsOut = [];
   let arg;
   while ((arg = args.shift())) {
-    let m = /^(\/[^:]+)(?::(.*))?$/.exec(arg);
+    let m = /^[\/\-]([^:]+)(?::(.*))?$/.exec(arg);
     if (m) {
       let [, libflag, value] = m;
       let output, path;
-      switch (libflag) {
-        case "/OUT":
+      switch (libflag.toUpperCase()) {
+        case "OUT":
           output = "static_lib";
         // Fall through.
-        case "/DEF":
-        case "/LIST":
-        case "/LIBPATH":
-        case "/NAME":
-        case "/OUT":
+        case "DEF":
+        case "LIST":
+        case "LIBPATH":
+        case "NAME":
+        case "OUT":
           path = resolve(cwd, value);
       }
       argsOut.push({ libflag, value, output, path });

diff --git a/trace.js b/trace.js
@@ -294,8 +294,8 @@ async function traceTargetBuild(target) {
     const { program, cwd, args } = command;
     for (const arg of args) {
       let m =
-        (program === "lib" && /^\/OUT:(.*)$/.exec(arg)) ||
-        (program === "cl" && /^\/Fo(.*)$/.exec(arg)) ||
+        (program === "lib" && /^[\/\-]OUT:(.*)$/i.exec(arg)) ||
+        (program === "cl" && /^[\/\-]Fo(.*)$/.exec(arg)) ||
         (program === "cc" && /^\-o(.*)$/.exec(arg));
       program === "ar" && /^(.*\.a)$/.exec(arg);
       if (m) {