diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh index 0d1f65c253..9d57589838 100755 --- a/.ci/ci-configure.sh +++ b/.ci/ci-configure.sh @@ -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 diff --git a/.travis.yml b/.travis.yml index e4d8cc9ca4..4e19347316 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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"