From 8bc998b2c5e09d87ec7b6b172fd5b3c0372a2348 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 27 Dec 2022 16:25:51 -0600 Subject: [PATCH] fix: do not impose no_sandboxing on ocamldep (#6749) ocamlc and ocamlopt don't play well with sandboxing, but ocamldep is fine Signed-off-by: Rudi Grinberg --- 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 d9b41c17065..17141b9a360 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -79,6 +79,9 @@ Unreleased - Remove spurious build dir created when running `dune init proj ...` (#6707, fixes #5429, @gridbugs) +- Allow `--sandbox` to affect `ocamldep` invocations. Previously, they were + wrongly marked as incompatible (#6749, @rgrinberg) + 3.6.1 (2022-11-24) ------------------ diff --git a/src/dune_rules/compilation_context.ml b/src/dune_rules/compilation_context.ml index 9675e284e93..fe374180a47 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