diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2016-08-05 20:06:17 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2016-08-05 20:06:17 -0400 |
| commit | c921d0df325c803fed8c7742eb088cb3d030d541 (patch) | |
| tree | 16d374660aa9adb92c2f08317a20d61ae995ef9a /.travis.yml | |
| parent | a3e471e933945dcfb54873cb20c691a193b55671 (diff) | |
| parent | bd6f549a527856db3878f1586c6666646a45d8ee (diff) | |
Merge branch 'upstream' into dfsg_clean20160805+dfsg
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 0b2b8b90..df4e4abc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,8 @@ before_install: - if command -v apt-get &>/dev/null; then sudo apt-get update -qq; fi - if command -v apt-get &>/dev/null; then sudo apt-get install -y mlton; fi - if command -v brew &>/dev/null; then brew update; fi - - if command -v brew &>/dev/null; then brew tap MLton/mlton; fi + - if command -v brew &>/dev/null; then brew uninstall libtool; fi + - if command -v brew &>/dev/null; then brew install libtool; fi - if command -v brew &>/dev/null; then brew install openssl mlton; fi - if command -v brew &>/dev/null; then export CONFIGURE_ARGS="--with-openssl=/usr/local/opt/openssl"; fi |