Fix build with multiple outputs and subninja.

T-Pau · Dec 26, 2023 · bf4cb05 · bf4cb05
1 parent 83e5d2b
commit bf4cb05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Build.cc b/src/Build.cc
@@ -37,7 +37,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 Build::Build(Tokenizer& tokenizer) {
     outputs = Text{ tokenizer, Tokenizer::TokenType::COLON };
     for (auto& element: outputs) {
-        element.type = Text::ElementType::BUILD_FILE;
+        if (element.type == Text::ElementType::WORD) {
+            element.type = Text::ElementType::BUILD_FILE;
+        }
     }
     inputs = Text{tokenizer, Tokenizer::TokenType::NEWLINE};
     bindings = Bindings{ tokenizer };

diff --git a/src/File.cc b/src/File.cc
@@ -131,7 +131,7 @@ void File::create_output() const {
         if (!subninjas.empty()) {
             stream << std::endl;
             for (auto& subninja: subninjas) {
-                stream << "subninja " << replace_extension(subninja, "ninja") << std::endl;
+                stream << "subninja " << replace_extension(subninja, "ninja").string() << std::endl;
             }
         }
     }