summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2017-11-29 20:33:00 +0100
committerscheibelp <scheibel1@llnl.gov>2017-11-29 11:33:00 -0800
commitaa248586481fa089caccdf18c338d797fabe6f0f (patch)
treef6d7405458be98a6b8137f90c22bca223b07acca
parent02371d2ace7c366f0b0b6332010323d478bc7652 (diff)
downloadspack-aa248586481fa089caccdf18c338d797fabe6f0f.tar.gz
spack-aa248586481fa089caccdf18c338d797fabe6f0f.tar.bz2
spack-aa248586481fa089caccdf18c338d797fabe6f0f.tar.xz
spack-aa248586481fa089caccdf18c338d797fabe6f0f.zip
travis: removed /usr/local/include/c++ before installing gcc on OSX (#6515)
"brew install gcc" fails for travis build because of an existing /usr/local/include/c++. This commit removes the offending file as suggested by brew.
-rw-r--r--.travis.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index ec88f02e39..5b92f622b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -120,6 +120,7 @@ cache: pip
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions python > /dev/null || brew install python; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rm /usr/local/include/c++ ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions gcc > /dev/null || brew install gcc; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions gnupg2 > /dev/null || brew install gnupg2; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then virtualenv venv; fi