aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-11-03 11:19:08 -0600
committerluigi1111 <luigi1111w@gmail.com>2020-11-03 11:19:08 -0600
commit011b8ebe1815d3fc9a2e3f9372c3a64eda791268 (patch)
tree23127b22c8fdadad2e1e0537daf781dcaa60bdfa
parent8b3b106ad1bc32b81a3ef74e789844d9f671f709 (diff)
parent2014a8410af6562bdcfb0129f430c25565a79192 (diff)
downloadmonzero-core-011b8ebe1815d3fc9a2e3f9372c3a64eda791268.tar.gz
monzero-core-011b8ebe1815d3fc9a2e3f9372c3a64eda791268.tar.xz
monzero-core-011b8ebe1815d3fc9a2e3f9372c3a64eda791268.zip
Merge pull request #6886
2014a84 Force CMAKE_SKIP_RPATH=ON (hyc)
-rw-r--r--contrib/gitian/gitian-freebsd.yml2
-rw-r--r--contrib/gitian/gitian-linux.yml2
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