diff --git a/scripts/pinned_build.sh b/scripts/pinned_build.sh index 15159851ab..0117067c66 100755 --- a/scripts/pinned_build.sh +++ b/scripts/pinned_build.sh @@ -75,6 +75,8 @@ install_clang() { try tar -xvf ${CLANG_FN} -C ${CLANG_DIR} pushdir ${CLANG_DIR} mv clang+*/* . + #prevent LLVM bundled with clang from being discovered by cmake + try rm -r lib/cmake popdir ${DEP_DIR} rm ${CLANG_FN} fi @@ -132,7 +134,7 @@ pushdir ${LEAP_DIR} # build Leap echo "Building Leap ${SCRIPT_DIR}" -try cmake -DCMAKE_TOOLCHAIN_FILE=${SCRIPT_DIR}/pinned_toolchain.cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=${LLVM_DIR}/lib/cmake -DCMAKE_PREFIX_PATH=${BOOST_DIR}/bin ${SCRIPT_DIR}/.. +try cmake -DCMAKE_TOOLCHAIN_FILE=${SCRIPT_DIR}/pinned_toolchain.cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="${LLVM_DIR}/lib/cmake;${BOOST_DIR}/bin" ${SCRIPT_DIR}/.. try make -j${JOBS} try cpack