Skip to content

remove dune-build-root and replace it with workspace_root #18201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
glyh wants to merge 1 commit into
base: compatible
Choose a base branch
from
+5 −16
Draft

remove dune-build-root and replace it with workspace_root #18201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/lib/crypto/kimchi_bindings/dune
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/lib/crypto/kimchi_bindings/js/node_js/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@
flags.sexp)
(deps
build.sh
../../dune-build-root
(source_tree ../../../proof-systems))
(locks /cargo-lock) ; lock for rustup
(action
(progn
(setenv
CARGO_TARGET_DIR
"%{read:../../dune-build-root}/cargo_kimchi_wasm"
"%{workspace_root}/cargo_kimchi_wasm"
(run bash build.sh))
(write-file flags.sexp "()"))))
3 changes: 1 addition & 2 deletions src/lib/crypto/kimchi_bindings/js/web/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@
flags.sexp)
(deps
build.sh
../../dune-build-root
(source_tree ../../../proof-systems))
(locks /cargo-lock) ; lock for rustup
(action
(progn
(setenv
CARGO_TARGET_DIR
"%{read:../../dune-build-root}/cargo_kimchi_wasm"
"%{workspace_root}/cargo_kimchi_wasm"
(run bash build.sh))
(write-file flags.sexp "()"))))
6 changes: 3 additions & 3 deletions src/lib/crypto/kimchi_bindings/stubs/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
kimchi-stubs
--release
--target-dir
%{read:../dune-build-root}/cargo_kimchi_stubs
%{workspace_root}/cargo_kimchi_stubs
--offline))
(run
cp
%{read:../dune-build-root}/cargo_kimchi_stubs/release/libkimchi_stubs.a
%{workspace_root}/cargo_kimchi_stubs/release/libkimchi_stubs.a
.))))

;; this is used by nix
Expand Down Expand Up @@ -171,7 +171,7 @@
(run rm -f ./Cargo.lock)
(setenv
CARGO_TARGET_DIR
"%{read:../dune-build-root}/cargo_kimchi_bindgen"
"%{workspace_root}/cargo_kimchi_bindgen"
(run cargo run %{targets} --offline))
(run ocamlformat -i %{targets}))))

Expand Down