aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpartouf <partouf@gmail.com>2021-10-19 21:45:54 +0000
committerpartouf <partouf@gmail.com>2021-10-19 21:45:54 +0000
commitc8569b8e4c7af41cd3f538d4e46756ecc0b913c0 (patch)
tree796ee56a15c7dd255faa790c722af13dc72331c1
parent8383b64d94ed58c6a49f133e372e185b4fea609d (diff)
downloadcompiler-explorer-gh-1176.tar.gz
compiler-explorer-gh-1176.zip
fix tool includeKey thingsgh-1176
-rw-r--r--lib/compiler-finder.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/compiler-finder.js b/lib/compiler-finder.js
index 831255684..2a809dd54 100644
--- a/lib/compiler-finder.js
+++ b/lib/compiler-finder.js
@@ -384,7 +384,14 @@ export class CompilerFinder {
compiler.tools = _.omit(
fullOptions.tools[langId],
tool => tool.isCompilerExcluded(compiler.id, (propName, def) => {
- return this.compilerProps(langId, propName, def);
+ let val = this.compilerProps(langId, `compiler.${compiler.id}.${propName}`);
+ if (!val) {
+ if (compiler.group) {
+ val = this.compilerProps(langId, `group.${compiler.group}.${propName}`);
+ if (!val) return def;
+ }
+ }
+ return val;
}));
}
}