From d7526102e852f7059e9f288ad5d81b3b66b2f236 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 20 Dec 2022 20:23:05 -0600 Subject: [PATCH] fix: do not impose no_sandboxing on ocamldep ocamlc and ocamlopt don't play well with sandboxing, but ocamldep is fine Signed-off-by: Rudi Grinberg ps-id: cd518774-0ed7-4f52-9169-a709ac1ab7a7 --- CHANGES.md | 3 +++ src/dune_rules/compilation_context.ml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 4e65e5e6591e..556852b8706f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -76,6 +76,9 @@ Unreleased - Fix inline tests with *js_of_ocaml* and whole program compilation mode enabled (#6645, @hhugo) +- Allow `--sandbox` to affect `ocamldep` invocations. Previously, they were + wrongly marked as incompatible (#.., @rgrinberg) + 3.6.1 (2022-11-24) ------------------ diff --git a/src/dune_rules/compilation_context.ml b/src/dune_rules/compilation_context.ml index 9675e284e93c..fe374180a477 100644 --- a/src/dune_rules/compilation_context.ml +++ b/src/dune_rules/compilation_context.ml @@ -167,7 +167,7 @@ let create ~super_context ~scope ~expander ~obj_dir ~modules ~flags let opaque = eval_opaque (Super_context.context super_context) opaque in let ocamldep_modules_data : Ocamldep.Modules_data.t = { dir = Obj_dir.dir obj_dir - ; sandbox + ; sandbox = Sandbox_config.no_special_requirements ; obj_dir ; sctx = super_context ; vimpl