From 819f2f92f6187985ffd89c1fbc897b6ccd094b9d Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sun, 11 Oct 2020 00:25:45 +0500 Subject: [PATCH] travis-ci: do not use aggressive LD_LIBRARY_PATH anymore switch to more elegant "rpath" linking --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3bfd5ff7..b36a86f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,10 +35,8 @@ matrix: - | if [ ! -z ${COVERITY_SCAN_TOKEN+x} ]; then export OPENSSL_ROOT_DIR=${OPENSSL_INSTALL_DIR} - export LD_LIBRARY_PATH="${HOME}/opt/lib:${LD_LIBRARY_PATH:-}" export CFLAGS="-I${HOME}/opt/include" - export LDFLAGS="-L${HOME}/opt/lib" - echo "check_certificate = off" > ~/.wgetrc + export LDFLAGS="-L${HOME}/opt/lib -Wl,-rpath,${HOME}/opt/lib" curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true fi - env: OPENSSL_VERSION="1.1.1c" @@ -79,10 +77,8 @@ before_install: script: - export OPENSSL_ROOT_DIR=${OPENSSL_INSTALL_DIR} - - export LD_LIBRARY_PATH="${HOME}/opt/lib:${LD_LIBRARY_PATH:-}" - export CFLAGS="-I${HOME}/opt/include" - - export LDFLAGS="-L${HOME}/opt/lib" - - echo "check_certificate = off" > ~/.wgetrc + - export LDFLAGS="-L${HOME}/opt/lib -Wl,-rpath,${HOME}/opt/lib" - .ci/sonarcloud.sh - ./configure - make -j $(nproc || sysctl -n hw.ncpu || echo 4) -C build