puck/zilch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(zilch lang ninja build): don't print missing errors for nix store paths

Browse source
This commit is contained in:
puck 2025-05-01 13:20:05 +00:00
parent 40638ad666
commit ec05d19a1e
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lang/ninja/src/build.sld
View file

@ -55,9 +55,8 @@
; This file is produced by another build edge. Add it to our input vfs. ; This file is produced by another build edge. Add it to our input vfs.
(let ((prev-copy-input-files copy-input-files)) (let ((prev-copy-input-files copy-input-files))
(set! copy-input-files #~,(string-append #$prev-copy-input-files "\n" "$COREUTILS/mkdir -p bdir/" relative-to-root "/$($COREUTILS/dirname " path "); $COREUTILS/cp -rf " #$(force input-file) " bdir/" relative-to-root "/" path))); (set! vfs (vfs-append-file vfs (normalize-path path) (force input-file))) (set! copy-input-files #~,(string-append #$prev-copy-input-files "\n" "$COREUTILS/mkdir -p bdir/" relative-to-root "/$($COREUTILS/dirname " path "); $COREUTILS/cp -rf " #$(force input-file) " bdir/" relative-to-root "/" path))); (set! vfs (vfs-append-file vfs (normalize-path path) (force input-file)))
(if (string-prefix? "/nix/store" path) (unless (string-prefix? "/nix/store" path)
(fprintf (current-error-port) "Path doesn't exist as build edge: ~S\n" path) (error "Path doesn't exist as build edge" path))))
(error "Path doesn't exist as build edge" path))))
; Workaround for Meson not adding the .so as build dependency when linking, instead using a .symbols file. ; Workaround for Meson not adding the .so as build dependency when linking, instead using a .symbols file.
; This makes sense, as it only relinks when symbols change, but it breaks the dependency link, and is the only ; This makes sense, as it only relinks when symbols change, but it breaks the dependency link, and is the only