ci: explicitly set PKG_CONFIG_PATH for openssl

travis upgraded to macos high sierra overnight without notification(?)
and this is now required in order to find openssl for some reason

also disable config.cache to prevent configure errors

Differential Revision: https://phab.enlightenment.org/D6718
This commit is contained in:
Mike Blumenkrantz 2018-07-31 22:38:03 -04:00 committed by Marcel Hollerbach
parent b9b209f60f
commit 9d631d57a5
2 changed files with 1 additions and 5 deletions

View File

@ -70,7 +70,7 @@ else
export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig"
# Normal build test of all targets
rm -f ~/.ccache/ccache.conf

View File

@ -84,10 +84,6 @@ before_script:
fi
- .ci/ci-ccache-stats.sh
- |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
cp $HOME/cachedir/config.cache . || true
fi
script:
- .ci/ci-configure.sh "$CI_BUILD_TYPE"