From 89ea8bc66116f78dea06d0e98ebc480db90f2e1e Mon Sep 17 00:00:00 2001 From: Artem Pianykh Date: Mon, 8 Jul 2019 02:12:36 -0700 Subject: [PATCH] [infra] Update dune to 1.10.0 Summary: Dune is updated from 1.6.3 to 1.10.0. One thing to keep in mind is that dune 1.7.0 changed the compilation layout compared to 1.6.3 (see https://github.com/ocaml/dune/pull/1676). Reviewed By: ngorogiannis Differential Revision: D16121954 fbshipit-source-id: 8ceb8429f --- opam.locked | 2 +- scripts/infer_repl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opam.locked b/opam.locked index bf445851a..89c2cb147 100644 --- a/opam.locked +++ b/opam.locked @@ -53,7 +53,7 @@ depends: [ "cppo" {= "1.6.5"} "cppo_ocamlbuild" {= "1.6.0"} "ctypes" {= "0.14.0"} - "dune" {= "1.6.3"} + "dune" {= "1.10.0"} "easy-format" {= "1.3.1"} "elina" {= "1.1"} "extlib" {= "1.7.5"} diff --git a/scripts/infer_repl b/scripts/infer_repl index 7d17c0c55..758322312 100755 --- a/scripts/infer_repl +++ b/scripts/infer_repl @@ -6,7 +6,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # where to find toplevel.bc, can be overridden BUILD_DIR=${BUILD_DIR:-"$SCRIPT_DIR"/../infer/src/_build/default} -INCLUDE_FLAGS=$(find "$BUILD_DIR" -type d -name '*.objs' -exec printf -- '-I {}\n' \;) +INCLUDE_FLAGS=$(find "$BUILD_DIR" -type d -name '*.objs' -exec printf -- '-I {}/byte\n' \;) # The -init option is effective only in interactive mode. # In batch mode, scripts need to import toplevel_init themselves.