Override CC env variable in Crystal propeties (#2776)

This commit is contained in:
Quinton Miller
2021-07-12 21:37:32 +08:00
committed by GitHub
parent 2aa95dbca3
commit 6ea7669814
3 changed files with 20 additions and 1 deletions

View File

@@ -12,19 +12,28 @@ group.crystal.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
compiler.crystal10.semver=1.0.0
compiler.crystal10.exe=/opt/compiler-explorer/crystal-1.0.0/bin/crystal
compiler.crystal10.cc=/opt/compiler-explorer/gcc-snapshot/bin/gcc
compiler.crystal036.semver=0.36.1
compiler.crystal036.exe=/opt/compiler-explorer/crystal-0.36.1/bin/crystal
compiler.crystal036.cc=/opt/compiler-explorer/gcc-snapshot/bin/gcc
compiler.crystal035.semver=0.35.1
compiler.crystal035.exe=/opt/compiler-explorer/crystal-0.35.1/bin/crystal
compiler.crystal035.cc=/opt/compiler-explorer/gcc-snapshot/bin/gcc
compiler.crystal034.semver=0.34.0
compiler.crystal034.exe=/opt/compiler-explorer/crystal-0.34.0/bin/crystal
compiler.crystal034.cc=/opt/compiler-explorer/gcc-snapshot/bin/gcc
compiler.crystal033.semver=0.33.0
compiler.crystal033.exe=/opt/compiler-explorer/crystal-0.33.0/bin/crystal
compiler.crystal033.cc=/opt/compiler-explorer/gcc-snapshot/bin/gcc
compiler.crystal032.semver=0.32.1
compiler.crystal032.exe=/opt/compiler-explorer/crystal-0.32.1/bin/crystal
compiler.crystal032.cc=/opt/compiler-explorer/gcc-snapshot/bin/gcc
compiler.crystal031.semver=0.31.1
compiler.crystal031.exe=/opt/compiler-explorer/crystal-0.31.1/bin/crystal
compiler.crystal031.cc=/opt/compiler-explorer/gcc-snapshot/bin/gcc
compiler.crystal030.semver=0.30.1
compiler.crystal030.exe=/opt/compiler-explorer/crystal-0.30.1/bin/crystal
compiler.crystal030.cc=/opt/compiler-explorer/gcc-snapshot/bin/gcc
compiler.crystal029.semver=0.29.0
compiler.crystal029.exe=/opt/compiler-explorer/crystal-0.29.0/bin/crystal
compiler.crystal029.cc=/opt/compiler-explorer/gcc-snapshot/bin/gcc

View File

@@ -1,5 +1,6 @@
# compile with --prelude=empty
# Type your code here, or load an example.
# compile with --prelude=empty
fun square(num : Int32) : Int32
num &* num
end

View File

@@ -45,6 +45,15 @@ export class CrystalCompiler extends BaseCompiler {
return [];
}
getDefaultExecOptions() {
const execOptions = super.getDefaultExecOptions();
const cc = this.compilerProps(`compiler.${this.compiler.id}.cc`);
if (cc) {
execOptions.env.CC = cc;
}
return execOptions;
}
optionsForFilter(filters, outputFilename, userOptions) {
const output = this.filename(this.getExecutableFilename(path.dirname(outputFilename), this.outputFilebase));
let options = ['build', '-o', output];