From 3f841baa1a5f1d4e5e3e97d9b639ad3c586df6ba Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 11 May 2025 22:21:07 +0000 Subject: [PATCH] (zilch lang ninja build): properly elide meson-private Change-Id: I6a6a69647cac0ffa083525236e6b23b7e418ebd6 --- lang/ninja/src/build.sld | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/ninja/src/build.sld b/lang/ninja/src/build.sld index 06e4ff0..c2fdb26 100644 --- a/lang/ninja/src/build.sld +++ b/lang/ninja/src/build.sld @@ -148,7 +148,7 @@ (for-each append-file (build-edge-inputs current-edge)) (for-each append-file (build-edge-implicit-dependencies current-edge)) (for-each append-file (build-edge-order-only-dependencies current-edge)) - + (when (and (or (string=? (build-edge-rule current-edge) "CUSTOM_COMMAND") @@ -310,7 +310,7 @@ (if (eq? loc 'directory) (set! base-paths (mapping-set! base-paths path (delay (vfs-to-store (vfs-subdir (ninja-build-config-root-dir conf) vfs-path))))) (set! base-paths (mapping-set! base-paths path loc))) - (set! edges (mapping-set! edges path (cons 'base #f))) + (set! edges (mapping-set! edges path (cons (if (string-prefix? "meson-private/" path) 'base-path 'base) #f))) (set! path-to-vfs (mapping-set! path-to-vfs path kv))) (vfs-contents (ninja-build-config-root-dir conf))) (define filtered-vfs (mapping-copy (vfs-contents (ninja-build-config-root-dir conf))))