Restore relative output paths for DubPathDependency targets

This was recently changed to absolute paths in f1c098d.
symmetryinvestments · Apr 15, 2024 · 5c91567 · 5c91567
1 parent c2d4187
commit 5c91567
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/payload/reggae/rules/dub/external.d b/payload/reggae/rules/dub/external.d
@@ -142,9 +142,8 @@ private struct DubPathDependency {
         // whole path to a target.
 
         return dubBuild(subOptions, dubInfo)
-            .mapOutputs((string o) => buildNormalizedPath(projectPath,
-                                                          subOptions.projectPath.relativePath(projectPath),
-                                                          o));
+            .mapOutputs((string o) => buildNormalizedPath(
+                subOptions.projectPath.relativePath(projectPath), o));
     }
 }
 

diff --git a/src/reggae/reggae.d b/src/reggae/reggae.d
@@ -445,6 +445,8 @@ private string buildReggaefileWithReggae(
     import std.stdio: stdout;
     buildReggaefileDub(stdout, options, Yes.needDub);
 
+    const dubRecipeDir = hiddenDirAbsPath(options);
+
     // FIXME - use correct D compiler.
     // The reason it doesn't work now is due to a test using
     // a custom compiler
@@ -453,8 +455,9 @@ private string buildReggaefileWithReggae(
     auto newOptions = options.dup;
     newOptions.backend = Backend.binary;
     newOptions.dubObjsDir = dubObjsDir;
+    newOptions.projectPath = dubRecipeDir;
+    newOptions.workingDir = dubRecipeDir;
 
-    const dubRecipeDir = hiddenDirAbsPath(options);
     auto build = Build(dubPackage(newOptions, DubPath(dubRecipeDir)));
 
     runtimeBuild(newOptions, build);