Merge pull request #11205 from MinaProtocol/georgeee/merge-compatible…

…-to-develop-2022-06-07 Merge `compatible` to `develop`
MinaProtocol · Jun 7, 2022 · 7028850 · 7028850
2 parents eb4207f + 7fa40f6
commit 7028850
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/external/ocaml-rocksdb/dune b/src/external/ocaml-rocksdb/dune
@@ -15,9 +15,10 @@
  (libraries dune.configurator)
  )
 
+;; todo: fails with sandbox, since the generated flags are opaque to dune
 (rule
  (targets flags.sexp)
- (deps librocksdb_stubs.a)
+ (deps librocksdb_stubs.a (sandbox none))
  (action (run ./rocks_linker_flags_gen.exe)))
 
 (rule

diff --git a/src/lib/mina_version/normal/dune b/src/lib/mina_version/normal/dune
@@ -8,5 +8,8 @@
 
 (rule
  (targets mina_version.ml)
- (deps (:< gen.sh) (universe))
+ (deps
+   (sandbox none)
+   (:< gen.sh)
+   (universe))
  (action (run %{<} %{targets})))