@andersbakken/fisk 4.0.17 → 4.0.19

package/builder/VM_runtime.js

@@ -3139,56 +3139,51 @@ class Compile extends EventEmitter__default["default"] {
             throw new Error("No sourcefile");
         }
         if (!hasDashX) {
-            if (compiler.indexOf("g++") !== -1 || compiler.indexOf("c++") !== -1) {
-                args.unshift(isClang ? "c++" : "c++-cpp-output");
-            }
-            else {
-                switch (path__default["default"].extname(sourceFile)) {
-                    case ".C":
-                    case ".cc":
-                    case ".cpp":
-                    case ".CPP":
-                    case ".c++":
-                    case ".cp":
-                    case ".cxx":
-                        args.unshift(isClang ? "c++" : "c++-cpp-output");
-                        break;
-                    case ".ii":
-                        args.unshift("c++-cpp-output");
-                        break;
-                    case ".hh":
-                    case ".hpp":
-                    case ".H":
-                        args.unshift("c++-header");
-                        break;
-                    case ".h":
-                        args.unshift("c-header");
-                        break;
-                    case ".c":
-                        args.unshift(isClang ? "c" : "cpp-output");
-                        break;
-                    case ".i":
-                        args.unshift("cpp-output");
-                        break;
-                    case ".m":
-                    case ".mi":
-                        args.unshift(isClang ? "objective-c" : "objective-c-cpp-output");
-                        break;
-                    case ".s":
-                        args.unshift("assembler");
-                        break;
-                    case ".sx":
-                    case ".S":
-                        args.unshift("assembler-with-cpp");
-                        break;
-                    case ".mm":
-                    case ".M":
-                    case ".mii":
-                        args.unshift(isClang ? "objective-c++" : "objective-c++-cpp-output");
-                        break;
-                    default:
-                        throw new Error(`Can't determine source language for file: ${sourceFile}`);
-                }
+            switch (path__default["default"].extname(sourceFile)) {
+                case ".C":
+                case ".cc":
+                case ".cpp":
+                case ".CPP":
+                case ".c++":
+                case ".cp":
+                case ".cxx":
+                    args.unshift(isClang ? "c++" : "c++-cpp-output");
+                    break;
+                case ".ii":
+                    args.unshift("c++-cpp-output");
+                    break;
+                case ".hh":
+                case ".hpp":
+                case ".H":
+                    args.unshift("c++-header");
+                    break;
+                case ".h":
+                    args.unshift("c-header");
+                    break;
+                case ".c":
+                    args.unshift(isClang ? "c" : "cpp-output");
+                    break;
+                case ".i":
+                    args.unshift("cpp-output");
+                    break;
+                case ".m":
+                case ".mi":
+                    args.unshift(isClang ? "objective-c" : "objective-c-cpp-output");
+                    break;
+                case ".s":
+                    args.unshift("assembler");
+                    break;
+                case ".sx":
+                case ".S":
+                    args.unshift("assembler-with-cpp");
+                    break;
+                case ".mm":
+                case ".M":
+                case ".mii":
+                    args.unshift(isClang ? "objective-c++" : "objective-c++-cpp-output");
+                    break;
+                default:
+                    throw new Error(`Can't determine source language for file: ${sourceFile}`);
             }
             args.unshift("-x");
         }
@@ -3210,6 +3205,7 @@ class Compile extends EventEmitter__default["default"] {
         if (!fs.existsSync("/usr/bin/as")) {
             this.emit("stderr", "as doesn't exist");
         }
+        console.log("going for it", compiler, args);
         // const env = Object.assign({ TMPDIR: dir, TEMPDIR: dir, TEMP: dir }, process.env);
         const proc = child_process__default["default"].spawn(compiler, args, {
             /*env: env, */ cwd: dir // , maxBuffer: 1024 * 1024 * 16

package/builder/fisk-builder.js

@@ -55822,6 +55822,8 @@ server.on("job", (job) => {
         else {
             j.op.feed(data.data);
         }
+        fs$4.writeFileSync("/tmp/preproc.ii", data.data);
+        // console.log("got data", data.data);
     });
     let idx = jobQueue.length;
     while (idx > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@andersbakken/fisk",
-    "version": "4.0.17",
+    "version": "4.0.19",
     "description": "Fisk, a distributed compile system",
     "scripts": {
         "lint": "eslint . --ext .ts",