diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2018-07-31 22:38:03 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2018-07-31 23:32:33 -0400 |
| commit | c88f15a34a85a40f851e435392bb052c0bddebc8 (patch) | |
| tree | 6dad79f1ab1d3f2cd77e15b8d378f90c17144c70 | |
| parent | f58d08b6b0de8271f8e92a75e9afb10fca8d1023 (diff) | |
| download | efl-devs/discomfitor/osxtest.tar.gz | |
ci: explicitly set PKG_CONFIG_PATH for openssldevs/discomfitor/osxtest
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
| -rwxr-xr-x | .ci/ci-configure.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh index 4ddd9079d7..c7485a4bbb 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" |