From c48e90e35761201000a38839ad17f1559ac652c9 Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Mon, 27 Mar 2017 14:30:40 +0100 Subject: [PATCH] Don't pass specific arguments when not using ppx_driver.runner Fix #37 --- src/gen_rules.ml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/gen_rules.ml b/src/gen_rules.ml index 89151c36..f2646a8c 100644 --- a/src/gen_rules.ml +++ b/src/gen_rules.ml @@ -766,18 +766,21 @@ module Gen(P : Params) = struct Build.vpath file let specific_args_for_ppx_rewriters t ~dir ~lib_name ~for_merlin = - Arg_spec.S - [ S (if t.uses_here - then [A "-dirname"; Path dir] - else []) - ; S (match lib_name with - | Some name when t.uses_libname -> - [ A "-inline-test-lib"; A name ] - | _ -> []) - ; S (if t.uses_ppx_driver && not for_merlin - then [ A "-embed-errors"; A "false" ] - else []) - ] + if t.uses_ppx_driver then + Arg_spec.S + [ S (if t.uses_here + then [A "-dirname"; Path dir] + else []) + ; S (match lib_name with + | Some name when t.uses_libname -> + [ A "-inline-test-lib"; A name ] + | _ -> []) + ; S (if not for_merlin + then [ A "-embed-errors"; A "false" ] + else []) + ] + else + Arg_spec.S [] end let ppx_drivers = Hashtbl.create 32