Use has_pforms

Signed-off-by: Etienne Millon <me@emillon.org>
ocaml · Sep 2, 2022 · cf6cd2b · cf6cd2b
1 parent 3155787
commit cf6cd2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -38,6 +38,10 @@
 
 - Fix compilation of Dune under esy on Windows (#6109, fixes #6098, @nojb)
 
+- `dune exec`: support syntax like `%{bin:program}`. This can appear anywhere
+  in the command line, so things like `dune exec time %{bin:program}` now work.
+  (#6035, fixes #2691, @emillon)
+
 3.4.1 (26-07-2022)
 ------------------
 

diff --git a/bin/exec.ml b/bin/exec.ml
@@ -38,7 +38,7 @@ type program_name =
 
 let parse_program_name s =
   match Arg.conv_parser Arg.dep s with
-  | Ok (File sw) when String.starts_with ~prefix:"%" s -> Sw sw
+  | Ok (File sw) when Dune_lang.String_with_vars.has_pforms sw -> Sw sw
   | _ -> String s
 
 type cli_item =