Don't rebuild build.d for PGO builds

And don't assume the current working dir is the DMD repo.
dlang · May 6, 2022 · 7151290 · 7151290
1 parent 2d6b526
commit 7151290
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/build.d b/src/build.d
@@ -601,10 +601,10 @@ alias dmdPGO = makeRule!((builder, rule) {
         .condition(() => PGOState.checkPGO(dmdKind))
         .deps([finalDataMerge])
         .commandFunction({
-            auto addArgs = pgoState.pgoUseFlags ~ "-wi";
-            auto cmd = [env["HOST_DMD_RUN"], "-run", "src/build.d", "ENABLE_RELEASE=1",
-            "ENABLE_LTO=1",
-            "DFLAGS="~joiner(addArgs, " ").to!string, "--force", "-j"~jobs.to!string];
+            const extraFlags = pgoState.pgoUseFlags ~ "-wi";
+            const scope cmd = [thisExePath, "HOST_DMD="~env["HOST_DMD_RUN"],
+                "ENABLE_RELEASE=1", "ENABLE_LTO=1", "DFLAGS="~extraFlags.join(" "),
+                "--force", "-j"~jobs.to!string];
             log("%-(%s %)", cmd);
             if (spawnProcess(cmd, null, Config.init).wait())
                 abortBuild("PGO Compilation failed");