Merge pull request #6886

2014a84 Force CMAKE_SKIP_RPATH=ON (hyc)
This commit is contained in:
luigi1111 2020-11-03 11:19:08 -06:00
commit 011b8ebe18
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 2 additions and 2 deletions

View file

@ -119,7 +119,7 @@ script: |
for i in ${HOSTS}; do for i in ${HOSTS}; do
export PATH=${WRAP_DIR}:${BASEPREFIX}/${i}/native/bin:${ORIGPATH} export PATH=${WRAP_DIR}:${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
mkdir build && cd build 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} make ${MAKEOPTS}
chmod 755 bin/* chmod 755 bin/*
cp ../LICENSE bin cp ../LICENSE bin

View file

@ -164,7 +164,7 @@ script: |
fi fi
export C_INCLUDE_PATH="$EXTRA_INCLUDES" export C_INCLUDE_PATH="$EXTRA_INCLUDES"
export CPLUS_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} make ${MAKEOPTS}
chmod 755 bin/* chmod 755 bin/*
cp ../LICENSE bin cp ../LICENSE bin