Merge branch 'release/0.10' into develop

This commit is contained in:
Sebastian Messmer 2019-02-03 18:41:03 -08:00
commit 65ee6fcc89

View File

@ -2,9 +2,6 @@
set -e
# Workaround homebrew bug, see https://twitter.com/axccl/status/1083393735277363205 and https://github.com/openPMD/openPMD-api/pull/431/files
#brew upgrade --cleanup || brew upgrade --cleanup
# Install newer GCC if we're running on GCC
if [ "${CXX}" == "g++" ]; then
# We need to uninstall oclint because it creates a /usr/local/include/c++ symlink that clashes with the gcc5 package