Skip to content

Commit dadadbe

Browse files
committed
Fix OSX build by yet again hardcoding things that should have been unnecessary
1 parent 44fa862 commit dadadbe

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.travis.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,10 @@ before_install:
182182
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
183183
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola lua openssl jack; fi
184184
# OpenSSL is not a proper install due to some Apple bull, so provide additional locations via the environment...
185-
- export CFLAGS="$CFLAGS -I/usr/local/opt/openssl/include"
186-
- export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib"
185+
# Additionally, newer versions of this "recipe" seem to use the name '[email protected]' instead of plain 'openssl' and there seems to be
186+
# no way to programmatically get the link and include paths. Genius! Hardcoding the new version for the time being...
187+
- export CFLAGS="$CFLAGS -I/usr/local/opt/[email protected]/include"
188+
- export LDFLAGS="$LDFLAGS -L/usr/local/opt/[email protected]/lib"
187189
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/ccache/libexec:$PATH; fi # Use ccache on Mac too
188190
#Coverity doesn't work with g++ 5 or 6, so only upgrade to g++ 4.9 for that
189191
- 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

0 commit comments

Comments
 (0)