Fix ninja build with spaces or colons

atilaneves · Sep 7, 2023 · 9eec4f2 · 9eec4f2
1 parent a89dc48
commit 9eec4f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/payload/reggae/backend/ninja.d b/payload/reggae/backend/ninja.d
@@ -38,12 +38,12 @@ struct Ninja {
 
     //includes rerunning reggae
     const(NinjaEntry)[] allBuildEntries() @safe {
-        import std.array: join;
+        import std.array: array;
         import std.algorithm: sort, uniq;
+        import std.range: chain;
 
         const files =
-            flattenEntriesInBuildLine(_options.reggaeFileDependencies)
-            ~ " " ~ _srcDirs.sort.uniq.join(" ")
+            flattenEntriesInBuildLine(chain(_options.reggaeFileDependencies, _srcDirs.sort.uniq).array);
             ;
         auto paramLines = _options.oldNinja ? [] : ["pool = console"];
 

diff --git a/payload/reggae/backend/package.d b/payload/reggae/backend/package.d
@@ -39,12 +39,8 @@ package string[] maybeAddDirDependencies(
     if(srcs.empty)
         return [];
 
-    auto dirs = srcs
+    return srcs
         .map!(t => t.expandOutputs(projectPath)[0])
-        .map!dirName;
-
-    return dirs
-        // otherwise ninja/make will emit this as 2 or more dependencies
-        .filter!(d => !d.canFind(" "))
+        .map!dirName
         .array;
 }