mirror of
https://github.com/SoftEtherVPN/SoftEtherVPN.git
synced 2024-12-25 17:49:52 +03:00
travis-ci: do not use aggressive LD_LIBRARY_PATH anymore
switch to more elegant "rpath" linking
This commit is contained in:
parent
e6a80fb4f2
commit
819f2f92f6
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user