File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -32,4 +32,4 @@ ENV ENABLE_TEST=false \
3232 ENABLE_ARCH_x86_64=true \
3333 EXTRA_CMAKE_FLAGS="-DTEST_TIMEOUT_SECONDS=90"
3434
35- ENTRYPOINT ["sh " , "./build_toxcore.sh" ]
35+ ENTRYPOINT ["bash " , "./build_toxcore.sh" ]
Original file line number Diff line number Diff line change 1- #! /bin/sh
1+ #! /usr/ bin/env bash
22
33set -e -x
44
@@ -61,6 +61,8 @@ build() {
6161 echo " SET(CROSSCOMPILING_EMULATOR /usr/bin/wine)" >> windows_toolchain.cmake
6262 fi
6363
64+ # Silly way to bypass a shellharden check
65+ read -ra EXTRA_CMAKE_FLAGS_ARRAY <<< " $EXTRA_CMAKE_FLAGS"
6466 cmake -DCMAKE_TOOLCHAIN_FILE=windows_toolchain.cmake \
6567 -DCMAKE_INSTALL_PREFIX=" $STATIC_TOXCORE_PREFIX_DIR " \
6668 -DENABLE_SHARED=OFF \
@@ -69,7 +71,7 @@ build() {
6971 -DCMAKE_CXX_FLAGS=" $CMAKE_CXX_FLAGS " \
7072 -DCMAKE_EXE_LINKER_FLAGS=" $CMAKE_EXE_LINKER_FLAGS -fstack-protector" \
7173 -DCMAKE_SHARED_LINKER_FLAGS=" $CMAKE_SHARED_LINKER_FLAGS " \
72- $EXTRA_CMAKE_FLAGS \
74+ " ${EXTRA_CMAKE_FLAGS_ARRAY[@]} " \
7375 -S ..
7476 cmake --build . --target install -- -j" $( nproc) "
7577
You can’t perform that action at this time.
0 commit comments