Update: Fixing some bugs from compiler inference after optimization

Author: MrcSnm

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
       - uses: MrcSnm/setup-dlang@v2
         with:
           compiler: ldc-latest
-          redub: master
+          redub: latest
 
       - name: Build
         if: runner.os != 'macOS'

source/redub/building/utils.d

@@ -3,17 +3,11 @@ import redub.buildapi;
 public import redub.misc.shell;
 import core.sys.posix.sys.ioctl;
 
-string[] getHighPriorityCmd(string[] compileFlags)
+string[] getHighPriorityCmd(string[] compileFlags, string compilerBin)
 {
     version(Posix)
-    {
-        import std.array;
-        string[] ret = new string[compileFlags.length + 3];
-        ret[0..3] = ["nice", "-n", "0"].staticArray;
-        ret[3..$] = compileFlags;
-        return ret;
-    }
-    return compileFlags;
+        return ["nice", "-n", "0", "--", compilerBin] ~ compileFlags;
+    return [compilerBin] ~ compileFlags;
 }
 
 ProcessExec2 execCompiler(const BuildConfiguration cfg, Compiler compiler, string[] compileFlags, out string compilationCommands, bool hasHighPriority, out string cmdFile, const string[string] env)
@@ -44,7 +38,7 @@ ProcessExec2 execCompiler(const BuildConfiguration cfg, Compiler compiler, strin
         return ret;
     }
     compilationCommands = escapeCompilationCommands(compilerBin, compileFlags);
-    return executeProcess2(cast(const(char)[][])getHighPriorityCmd(compileFlags), env, Config.none, size_t.max, cfg.workingDir);
+    return executeProcess2(cast(const(char)[][])getHighPriorityCmd(compileFlags, compilerBin), env, Config.none, size_t.max, cfg.workingDir);
 }
 
 

source/redub/misc/find_executable.d

@@ -53,5 +53,5 @@ string findExecutable(string executableName)
         }
 
     }
-    return "";
+    return null;
 }

source/redub/tooling/compilers_inference.d

@@ -123,18 +123,27 @@ private string getActualCompilerToUse(string preferredCompiler, ref string actua
     import std.typecons;
     import std.process;
     import redub.logging;
-    import std.path: baseName, stripExtension;
+    import std.path: baseName, stripExtension, isAbsolute;
+    import redub.misc.find_executable;
     Tuple!(int, "status", string, "output") compVersionRes;
+    compVersionRes.status = 1;
+    compVersionRes.output = "No compiler found.";
 
     bool preferredTested = false;
     foreach(string searchable; preferredCompiler~searchableCompilers)
     {
-        if(preferredTested && searchable == preferredCompiler)
+        if((preferredTested && searchable == preferredCompiler) || searchable.length == 0)
             continue;
         if(searchable != preferredCompiler)
             searchable = tryGetCompilerOnCwd(searchable);
         else
             preferredTested = true;
+        if(!isAbsolute(searchable))
+        {
+            searchable = findExecutable(searchable);
+            if(searchable.length == 0)
+                continue;
+        }
 
         string[2] versionCommand = [searchable, "--version"];
         size_t args = searchable.baseName.stripExtension != "cl" ? 2 : 1;