@andersbakken/fisk 4.0.17 → 4.0.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3139,56 +3139,52 @@ class Compile extends EventEmitter__default["default"] {
3139
3139
  throw new Error("No sourcefile");
3140
3140
  }
3141
3141
  if (!hasDashX) {
3142
- if (compiler.indexOf("g++") !== -1 || compiler.indexOf("c++") !== -1) {
3143
- args.unshift(isClang ? "c++" : "c++-cpp-output");
3144
- }
3145
- else {
3146
- switch (path__default["default"].extname(sourceFile)) {
3147
- case ".C":
3148
- case ".cc":
3149
- case ".cpp":
3150
- case ".CPP":
3151
- case ".c++":
3152
- case ".cp":
3153
- case ".cxx":
3154
- args.unshift(isClang ? "c++" : "c++-cpp-output");
3155
- break;
3156
- case ".ii":
3157
- args.unshift("c++-cpp-output");
3158
- break;
3159
- case ".hh":
3160
- case ".hpp":
3161
- case ".H":
3162
- args.unshift("c++-header");
3163
- break;
3164
- case ".h":
3165
- args.unshift("c-header");
3166
- break;
3167
- case ".c":
3168
- args.unshift(isClang ? "c" : "cpp-output");
3169
- break;
3170
- case ".i":
3171
- args.unshift("cpp-output");
3172
- break;
3173
- case ".m":
3174
- case ".mi":
3175
- args.unshift(isClang ? "objective-c" : "objective-c-cpp-output");
3176
- break;
3177
- case ".s":
3178
- args.unshift("assembler");
3179
- break;
3180
- case ".sx":
3181
- case ".S":
3182
- args.unshift("assembler-with-cpp");
3183
- break;
3184
- case ".mm":
3185
- case ".M":
3186
- case ".mii":
3187
- args.unshift(isClang ? "objective-c++" : "objective-c++-cpp-output");
3188
- break;
3189
- default:
3190
- throw new Error(`Can't determine source language for file: ${sourceFile}`);
3191
- }
3142
+ console.log("shit", compiler, sourceFile);
3143
+ switch (path__default["default"].extname(sourceFile)) {
3144
+ case ".C":
3145
+ case ".cc":
3146
+ case ".cpp":
3147
+ case ".CPP":
3148
+ case ".c++":
3149
+ case ".cp":
3150
+ case ".cxx":
3151
+ args.unshift(isClang ? "c++" : "c++-cpp-output");
3152
+ break;
3153
+ case ".ii":
3154
+ args.unshift("c++-cpp-output");
3155
+ break;
3156
+ case ".hh":
3157
+ case ".hpp":
3158
+ case ".H":
3159
+ args.unshift("c++-header");
3160
+ break;
3161
+ case ".h":
3162
+ args.unshift("c-header");
3163
+ break;
3164
+ case ".c":
3165
+ args.unshift(isClang ? "c" : "cpp-output");
3166
+ break;
3167
+ case ".i":
3168
+ args.unshift("cpp-output");
3169
+ break;
3170
+ case ".m":
3171
+ case ".mi":
3172
+ args.unshift(isClang ? "objective-c" : "objective-c-cpp-output");
3173
+ break;
3174
+ case ".s":
3175
+ args.unshift("assembler");
3176
+ break;
3177
+ case ".sx":
3178
+ case ".S":
3179
+ args.unshift("assembler-with-cpp");
3180
+ break;
3181
+ case ".mm":
3182
+ case ".M":
3183
+ case ".mii":
3184
+ args.unshift(isClang ? "objective-c++" : "objective-c++-cpp-output");
3185
+ break;
3186
+ default:
3187
+ throw new Error(`Can't determine source language for file: ${sourceFile}`);
3192
3188
  }
3193
3189
  args.unshift("-x");
3194
3190
  }
@@ -3210,6 +3206,7 @@ class Compile extends EventEmitter__default["default"] {
3210
3206
  if (!fs.existsSync("/usr/bin/as")) {
3211
3207
  this.emit("stderr", "as doesn't exist");
3212
3208
  }
3209
+ console.log("going for it", compiler, args);
3213
3210
  // const env = Object.assign({ TMPDIR: dir, TEMPDIR: dir, TEMP: dir }, process.env);
3214
3211
  const proc = child_process__default["default"].spawn(compiler, args, {
3215
3212
  /*env: env, */ cwd: dir // , maxBuffer: 1024 * 1024 * 16
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@andersbakken/fisk",
3
- "version": "4.0.17",
3
+ "version": "4.0.18",
4
4
  "description": "Fisk, a distributed compile system",
5
5
  "scripts": {
6
6
  "lint": "eslint . --ext .ts",