From c1c606ee0bfe235a84f03ad91ea3c6571d555963 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sat, 26 Jul 2025 15:42:17 +0000 Subject: [PATCH] (zilch lang ninja): consider .hpp to be headers Change-Id: I6a6a6964feb764a70916d87bc8a4029b4ae92e80 --- lang/ninja/src/build.sld | 1 + lang/ninja/src/nixpkgs.sld | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lang/ninja/src/build.sld b/lang/ninja/src/build.sld index 0469b54..92d8e96 100644 --- a/lang/ninja/src/build.sld +++ b/lang/ninja/src/build.sld @@ -329,6 +329,7 @@ (define (can-safely-elide-header path) (or (string-suffix? ".hh" path) + (string-suffix? ".hpp" path) (string-suffix? ".h" path))) ;; process a ninja file and corresponding vfs, and return two values: diff --git a/lang/ninja/src/nixpkgs.sld b/lang/ninja/src/nixpkgs.sld index 5032a2a..f49672d 100644 --- a/lang/ninja/src/nixpkgs.sld +++ b/lang/ninja/src/nixpkgs.sld @@ -278,7 +278,7 @@ "zilchPlace() {\n" "cd $NIX_BUILD_TOP; cp -rf --no-preserve=ownership " #$realised-store " bdir\n" "chmod ugo+rw -R bdir\n" - "(cd " #$realised-store "/src; find . -type f '(' -name '*.h' -o -name '*.hh' -o -name '*.so' ')') | while read f; do zilchMakeFile \"../src/$f\"; done\n" + "(cd " #$realised-store "/src; find . -type f '(' -name '*.h' -o -name '*.hh' -o -name '*.hpp' -o -name '*.so' ')') | while read f; do zilchMakeFile \"../src/$f\"; done\n" make-all-placeholder-files "cd bdir/build\n" "}\n"