From 025978d68e358f6385921fab533720f34489b833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= Date: Fri, 14 Jan 2022 14:54:21 +0100 Subject: [PATCH] [Opam] Run configure step even with > 2.0 --- dune.opam | 2 +- dune.opam.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dune.opam b/dune.opam index b74f8c10dc9..89b8733873d 100644 --- a/dune.opam +++ b/dune.opam @@ -38,7 +38,7 @@ conflicts: [ dev-repo: "git+https://github.com/ocaml/dune.git" build: [ # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path - ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} + ["ocaml" "configure.ml" "--libdir" lib] ["ocaml" "bootstrap.ml" "-j" jobs] ["./dune.exe" "build" "dune.install" "--release" "--profile" "dune-bootstrap" "-j" jobs] ] diff --git a/dune.opam.template b/dune.opam.template index 020daeda795..97824a56cb0 100644 --- a/dune.opam.template +++ b/dune.opam.template @@ -1,6 +1,6 @@ build: [ # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path - ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} + ["ocaml" "configure.ml" "--libdir" lib] ["ocaml" "bootstrap.ml" "-j" jobs] ["./dune.exe" "build" "dune.install" "--release" "--profile" "dune-bootstrap" "-j" jobs] ]