forked from enlightenment/efl
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:
parent
b9b209f60f
commit
9d631d57a5
|
@ -70,7 +70,7 @@ else
|
||||||
|
|
||||||
export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
|
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 LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
|
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig"
|
||||||
|
|
||||||
# Normal build test of all targets
|
# Normal build test of all targets
|
||||||
rm -f ~/.ccache/ccache.conf
|
rm -f ~/.ccache/ccache.conf
|
||||||
|
|
|
@ -84,10 +84,6 @@ before_script:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- .ci/ci-ccache-stats.sh
|
- .ci/ci-ccache-stats.sh
|
||||||
- |
|
|
||||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
|
||||||
cp $HOME/cachedir/config.cache . || true
|
|
||||||
fi
|
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- .ci/ci-configure.sh "$CI_BUILD_TYPE"
|
- .ci/ci-configure.sh "$CI_BUILD_TYPE"
|
||||||
|
|
Loading…
Reference in New Issue