diff options
| author | cbdev <cb@cbcdn.com> | 2019-11-22 20:21:25 +0100 |
|---|---|---|
| committer | cbdev <cb@cbcdn.com> | 2019-11-22 20:21:25 +0100 |
| commit | dadadbe4aa8028197cfaaedc37bceb920923b803 (patch) | |
| tree | 087b280afdc30399775bf4c345c3ec5e567d7ef2 | |
| parent | 44fa8625455ad161fccad337ab48e49fe587b52c (diff) | |
| download | midimonster-dadadbe4aa8028197cfaaedc37bceb920923b803.tar.gz midimonster-dadadbe4aa8028197cfaaedc37bceb920923b803.tar.bz2 midimonster-dadadbe4aa8028197cfaaedc37bceb920923b803.zip | |
Fix OSX build by yet again hardcoding things that should have been unnecessary
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index e1cef00..bdaf63a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -182,8 +182,10 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola lua openssl jack; fi # OpenSSL is not a proper install due to some Apple bull, so provide additional locations via the environment... - - export CFLAGS="$CFLAGS -I/usr/local/opt/openssl/include" - - export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib" +# Additionally, newer versions of this "recipe" seem to use the name 'openssl@1.1' instead of plain 'openssl' and there seems to be +# no way to programmatically get the link and include paths. Genius! Hardcoding the new version for the time being... + - export CFLAGS="$CFLAGS -I/usr/local/opt/openssl@1.1/include" + - export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl@1.1/lib" - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/ccache/libexec:$PATH; fi # Use ccache on Mac too #Coverity doesn't work with g++ 5 or 6, so only upgrade to g++ 4.9 for that - if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "sanitize" \) -a "$CC" = "gcc" ]; then export CC="ccache gcc-8"; export CXX="ccache g++-8"; fi |