diff --git a/.travis.yml b/.travis.yml index 44d826d56..d9c8b167e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y aspcud; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install opam; fi install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 60 ./build-infer.sh --yes java --opam-switch 4.06.1 --only-setup-opam; fi diff --git a/Makefile b/Makefile index 63de7d9df..0531e9a6d 100644 --- a/Makefile +++ b/Makefile @@ -544,7 +544,6 @@ ifdef DESTDIR ifeq (,$(findstring :/,:$(DESTDIR))) # DESTDIR is set and relative $(MAKE) -C facebook install 'DESTDIR=../$(DESTDIR)' -endif else # DESTDIR is set and absolute $(MAKE) -C facebook install @@ -553,6 +552,7 @@ else # DESTDIR not set $(MAKE) -C facebook install endif +endif # Nuke objects built from OCaml. Useful when changing the OCaml compiler, for instance. .PHONY: ocaml_clean