From 32d8036ebe257e16f532d5d36237b389c46030da Mon Sep 17 00:00:00 2001 From: Josh Berdine Date: Wed, 28 Sep 2016 03:03:44 -0700 Subject: [PATCH] Unbreak build when no system ocaml installed Summary: If ocaml is not installed (or if homebrew has sandboxed it out), `opam init` fails unless passed `--compiler`. Reviewed By: sblackshear, jvillard Differential Revision: D3927532 fbshipit-source-id: d2fbec9 --- build-infer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-infer.sh b/build-infer.sh index ffeb344bd..d4bea4706 100755 --- a/build-infer.sh +++ b/build-infer.sh @@ -98,10 +98,10 @@ check_installed () { setup_opam () { OCAML_VERSION="4.02.3" - opam init -j $NCPU --no-setup --yes + opam init --compiler=$OCAML_VERSION -j $NCPU --no-setup --yes OPAMSWITCH=infer-$OCAML_VERSION - opam switch install -j $NCPU $OPAMSWITCH --alias-of $OCAML_VERSION || true + opam switch set -j $NCPU $OPAMSWITCH --alias-of $OCAML_VERSION } add_opam_git_pin () {