diff --git a/.travis.yml b/.travis.yml index 830538e6763..1e47136abba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ install: bash -ex .travis-ci.sh prepare script: bash -ex .travis-ci.sh build # Please keep the list in sync with the minimal version of OCaml in -# dune-project and bootstrap.ml +# dune-project, dune.opam.template and bootstrap.ml matrix: include: diff --git a/dune-project b/dune-project index 7ea7dd00563..98df9f567a7 100644 --- a/dune-project +++ b/dune-project @@ -16,12 +16,7 @@ (package (name dune) - (depends - ;; Please keep the lower bound in sync with .travis.yml and - ;; min_ocaml_version in bootstrap.ml - (ocaml (>= 4.07)) - base-unix - base-threads) + ; The "depends" and "build" field are written in dune.opam.template (conflicts (odoc (< 1.3.0)) (dune-release (< 1.3.0)) diff --git a/dune.opam b/dune.opam index 073f40200d4..b0ccd87179c 100644 --- a/dune.opam +++ b/dune.opam @@ -26,11 +26,6 @@ license: "MIT" homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "ocaml" {>= "4.07"} - "base-unix" - "base-threads" -] conflicts: [ "odoc" {< "1.3.0"} "dune-release" {< "1.3.0"} @@ -43,3 +38,10 @@ build: [ ["ocaml" "bootstrap.ml" "-j" jobs] ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] ] +depends: [ + # Please keep the lower bound in sync with .travis.yml and + # min_ocaml_version in bootstrap.ml + ("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary")) + "base-unix" + "base-threads" +] diff --git a/dune.opam.template b/dune.opam.template index 0a30094cbe5..4c5a458a425 100644 --- a/dune.opam.template +++ b/dune.opam.template @@ -4,3 +4,10 @@ build: [ ["ocaml" "bootstrap.ml" "-j" jobs] ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] ] +depends: [ + # Please keep the lower bound in sync with .travis.yml, dune-project + # and min_ocaml_version in bootstrap.ml + ("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary")) + "base-unix" + "base-threads" +]