Update NDK toolchain finder (compiler-explorer#6461)

OfekShilon · May 10, 2024 · a71168c · a71168c
1 parent 44d48dc
commit a71168c
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/lib/compiler-finder.ts b/lib/compiler-finder.ts
@@ -466,17 +466,14 @@ export class CompilerFinder {
         for (const [langId, ndkPath] of Object.entries(ndkPaths)) {
             if (ndkPath) {
                 const toolchains = fs.readdirSync(`${ndkPath}/toolchains`);
-                for (const [version, index] of toolchains) {
-                    const path = `${ndkPath}/toolchains/${version}/prebuilt/linux-x86_64/bin/`;
-                    if (fs.existsSync(path)) {
-                        const cc = fs.readdirSync(path).find(filename => filename.includes('g++'));
-                        toolchains[index] = path + cc;
-                    } else {
-                        toolchains[index] = null;
+                for (const version of toolchains) {
+                    const path = `${ndkPath}/toolchains/${version}/prebuilt/linux-x86_64/bin`;
+                    for (const exe of fs.readdirSync(path)) {
+                        if (exe.endsWith('clang++') || exe.endsWith('g++')) {
+                            langToCompilers[langId].push(`${path}/${exe}`);
+                        }
                     }
                 }
-                // TODO: Something awful is going on with the type of toolchains here
-                langToCompilers[langId].push(toolchains.filter(x => x !== null));
             }
         }
     }