From 6f498db21220f77e598d0556526b94dfc885cbfe Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 27 Nov 2017 21:14:24 +0800 Subject: [PATCH] Fix incremental compilation with ppx's Same fix as 6a3c51c35899fe346804d34497dee594690c0ef6 but also for ppx's --- src/super_context.ml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/super_context.ml b/src/super_context.ml index 73b7449c..678b8aa2 100644 --- a/src/super_context.ml +++ b/src/super_context.ml @@ -791,7 +791,14 @@ module PP = struct add_rule sctx (libs >>> - Build.dyn_paths (Build.arr (Lib.archive_files ~mode ~ext_lib:ctx.ext_lib)) + Build.dyn_paths (Build.arr (fun libs -> + List.rev_append + (Lib.archive_files ~mode ~ext_lib:ctx.ext_lib libs) + (List.filter_map libs ~f:(function + | Lib.Internal (dir, lib) -> + Some (Path.relative dir (lib.name ^ ctx.ext_lib)) + | External _ -> + None)))) >>> Build.run ~context:ctx (Ok compiler) [ A "-o" ; Target target