diff options
| author | Howard Chu <hyc@symas.com> | 2020-10-12 23:15:12 +0100 |
|---|---|---|
| committer | Howard Chu <hyc@symas.com> | 2020-10-13 14:22:50 +0100 |
| commit | 518a2cdab496708359adbc38a7b2352cd0d2811e (patch) | |
| tree | df8c6f39de00c36133f39f2be350e80cd5b49edb /contrib | |
| parent | Merge pull request #6868 (diff) | |
| download | monero-518a2cdab496708359adbc38a7b2352cd0d2811e.tar.xz | |
Force CMAKE_SKIP_RPATH=ON
Fix empty RPATH token issue. Only affects Linux and FreeBSD.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitian/gitian-freebsd.yml | 2 | ||||
| -rw-r--r-- | contrib/gitian/gitian-linux.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/gitian/gitian-freebsd.yml b/contrib/gitian/gitian-freebsd.yml index c104bfd02..36b81c641 100644 --- a/contrib/gitian/gitian-freebsd.yml +++ b/contrib/gitian/gitian-freebsd.yml @@ -119,7 +119,7 @@ script: | for i in ${HOSTS}; do export PATH=${WRAP_DIR}:${BASEPREFIX}/${i}/native/bin:${ORIGPATH} mkdir build && cd build - cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DCMAKE_BUILD_TYPE=Release + cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON make ${MAKEOPTS} chmod 755 bin/* cp ../LICENSE bin diff --git a/contrib/gitian/gitian-linux.yml b/contrib/gitian/gitian-linux.yml index c682b8f36..0aac983cc 100644 --- a/contrib/gitian/gitian-linux.yml +++ b/contrib/gitian/gitian-linux.yml @@ -164,7 +164,7 @@ script: | fi export C_INCLUDE_PATH="$EXTRA_INCLUDES" export CPLUS_INCLUDE_PATH="$EXTRA_INCLUDES" - cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DBACKCOMPAT=ON + cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DBACKCOMPAT=ON -DCMAKE_SKIP_RPATH=ON make ${MAKEOPTS} chmod 755 bin/* cp ../LICENSE bin |