10 files changed, 24 insertions, 25 deletions
diff --git a/lib/compilers/WSL-CL.js b/lib/compilers/WSL-CL.js
index 831a13fe5..6181f4f54 100644
--- a/lib/compilers/WSL-CL.js
+++ b/lib/compilers/WSL-CL.js
@@ -31,9 +31,9 @@
 var Compile = require('../base-compiler');
 var asm = require('../asm-cl');
 
-function compileCl(info, env) {
-    var compile = new Compile(info, env);
-    compile.asm = new asm.AsmParser(env.compilerProps);
+function compileCl(info, env, langId) {
+    var compile = new Compile(info, env, langId);
+    compile.asm = new asm.AsmParser(compile.compilerProps);
     info.supportsFiltersInBinary = true;
     if (process.platform == "linux") {
         var origExec = compile.exec;
diff --git a/lib/compilers/Wine-CL.js b/lib/compilers/Wine-CL.js
index 0e92fe4de..d206bb0f2 100644
--- a/lib/compilers/Wine-CL.js
+++ b/lib/compilers/Wine-CL.js
@@ -25,12 +25,12 @@
 var Compile = require('../base-compiler');
 var asm = require('../asm-cl');
 
-function compileCl(info, env) {
-    var compile = new Compile(info, env);
-    compile.asm = new asm.AsmParser(env.compilerProps);
+function compileCl(info, env, langId) {
+    var compile = new Compile(info, env, langId);
+    compile.asm = new asm.AsmParser(compile.compilerProps);
     info.supportsFiltersInBinary = true;
     if (process.platform == "linux") {
-        var wine = env.gccProps("wine");
+        var wine = env.ceProps("wine");
         var origExec = compile.exec;
         compile.exec = function (command, args, options) {
             if (command.toLowerCase().endsWith(".exe")) {
diff --git a/lib/compilers/default.js b/lib/compilers/default.js
index 759d2bbe8..64a542760 100644
--- a/lib/compilers/default.js
+++ b/lib/compilers/default.js
@@ -24,7 +24,7 @@
 
 const Compile = require('../base-compiler');
 
-module.exports = function (info, env) {
-    var comp = new Compile(info, env);
+module.exports = function (info, env, langId) {
+    var comp = new Compile(info, env, langId);
     return comp.initialise();
 };
 \ No newline at end of file
diff --git a/lib/compilers/golang.js b/lib/compilers/golang.js
index a60920892..b550ee0d6 100644
--- a/lib/compilers/golang.js
+++ b/lib/compilers/golang.js
@@ -25,8 +25,8 @@
 var Compile = require('../base-compiler');
 var _ = require('underscore-node');
 
-function compilenewgol(info, env) {
-    var compiler = new Compile(info, env);
+function compilenewgol(info, env, langId) {
+    var compiler = new Compile(info, env, langId);
     compiler.originalGetDefaultExecOptions = compiler.getDefaultExecOptions;
 
     function convertNewGoL(code) {
@@ -71,7 +71,7 @@ function compilenewgol(info, env) {
 
     compiler.getDefaultExecOptions = function () {
         var execOptions = this.originalGetDefaultExecOptions();
-        var goroot = this.env.compilerProps("compiler." + this.compiler.id + ".goroot");
+        var goroot = this.compilerProps("compiler." + this.compiler.id + ".goroot");
         if (goroot) {
             execOptions.env.GOROOT = goroot;
         }
diff --git a/lib/compilers/haskell.js b/lib/compilers/haskell.js
index a4080192f..78963748e 100644
--- a/lib/compilers/haskell.js
+++ b/lib/compilers/haskell.js
@@ -1,7 +1,7 @@
 var Compile = require('../base-compiler');
 
-function compileHaskell(info, env) {
-    var compiler = new Compile(info, env);
+function compileHaskell(info, env, langId) {
+    var compiler = new Compile(info, env, langId);
     compiler.optionsForFilter = function (filters, outputFilename, userOptions) {
         return ['-S', '-g', '-o', this.filename(outputFilename)];
     };
diff --git a/lib/compilers/ispc.js b/lib/compilers/ispc.js
index 3bb0f124f..ff2b8054f 100644
--- a/lib/compilers/ispc.js
+++ b/lib/compilers/ispc.js
@@ -1,7 +1,7 @@
 var Compile = require('../base-compiler');
 
-function compileISPC(info, env) {
-    var compiler = new Compile(info, env);
+function compileISPC(info, env, langId) {
+    var compiler = new Compile(info, env, langId);
     compiler.optionsForFilter = function (filters, outputFilename, userOptions) {
         return ['--target=sse2-i32x4', '--emit-asm', '-g', '-o', this.filename(outputFilename)];
     };
diff --git a/lib/compilers/ldc.js b/lib/compilers/ldc.js
index 11de1e66c..ffee8bf95 100644
--- a/lib/compilers/ldc.js
+++ b/lib/compilers/ldc.js
@@ -25,8 +25,8 @@
 var Compile = require('../base-compiler'),
     argumentParsers = require("./argument-parsers");
 
-function compileLdc(info, env) {
-    var compiler = new Compile(info, env);
+function compileLdc(info, env, langId) {
+    var compiler = new Compile(info, env, langId);
     compiler.compiler.supportsIntel = true;
     compiler.optionsForFilter = function (filters, outputFilename, userOptions) {
         var options = ['-g', '-of', this.filename(outputFilename)];
diff --git a/lib/compilers/pascal.js b/lib/compilers/pascal.js
index f5855f6cd..e4f0fcbc0 100644
--- a/lib/compilers/pascal.js
+++ b/lib/compilers/pascal.js
@@ -24,15 +24,14 @@
 "use strict";
 
 var Compile = require('../base-compiler'),
-    logger = require('../logger').logger,
     PascalDemangler = require('../pascal-support').demangler,
     utils = require('../utils'),
     fs = require("fs"),
     path = require("path");
 
-function compileFPC(info, env) {
+function compileFPC(info, env, langId) {
     var demangler = new PascalDemangler();
-    var compiler = new Compile(info, env);
+    var compiler = new Compile(info, env, langId);
     compiler.supportsOptOutput = false;
 
     var originalExecBinary = compiler.execBinary;
diff --git a/lib/compilers/rust.js b/lib/compilers/rust.js
index 6d2295cbe..2fc60fa2b 100644
--- a/lib/compilers/rust.js
+++ b/lib/compilers/rust.js
@@ -25,8 +25,8 @@
 var Compile = require('../base-compiler'),
     _ = require('underscore-node');
 
-function compileRust(info, env) {
-    var compiler = new Compile(info, env);
+function compileRust(info, env, langId) {
+    var compiler = new Compile(info, env, langId);
     compiler.compiler.supportsIntel = true;
     compiler.optionsForFilter = function (filters, outputFilename, userOptions) {
         var options = ['-C', 'debuginfo=1', '-o', this.filename(outputFilename)];
diff --git a/lib/compilers/swift.js b/lib/compilers/swift.js
index 884828852..ffd39a295 100644
--- a/lib/compilers/swift.js
+++ b/lib/compilers/swift.js
@@ -1,8 +1,8 @@
 const Compile = require('../base-compiler'),
     logger = require('../logger').logger;
 
-function compileSwift(info, env) {
-    const compiler = new Compile(info, env);
+function compileSwift(info, env, langId) {
+    const compiler = new Compile(info, env, langId);
 
     compiler.handlePostProcessResult = function (result, postResult) {
         result.asm = postResult.stdout;