StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Make Restyled/shellharden happy

Browse Source
This commit is contained in:
Maxim Biro 2022-10-07 11:49:34 -04:00
parent 933a2aa452
commit e0b00d3e73
No known key found for this signature in database
GPG Key ID: AB3AD9896472BFA4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
other/docker/windows/Dockerfile
View File

@ -32,4 +32,4 @@ ENV ENABLE_TEST=false \
ENABLE_ARCH_x86_64=true \
EXTRA_CMAKE_FLAGS="-DTEST_TIMEOUT_SECONDS=90"
ENTRYPOINT ["sh", "./build_toxcore.sh"]
ENTRYPOINT ["bash", "./build_toxcore.sh"]

6
other/docker/windows/build_toxcore.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash
set -e -x
@ -61,6 +61,8 @@ build() {
echo "SET(CROSSCOMPILING_EMULATOR /usr/bin/wine)" >>windows_toolchain.cmake
fi
# Silly way to bypass a shellharden check
read -ra EXTRA_CMAKE_FLAGS_ARRAY <<<"$EXTRA_CMAKE_FLAGS"
cmake -DCMAKE_TOOLCHAIN_FILE=windows_toolchain.cmake \
-DCMAKE_INSTALL_PREFIX="$STATIC_TOXCORE_PREFIX_DIR" \
-DENABLE_SHARED=OFF \
@ -69,7 +71,7 @@ build() {
-DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS" \
-DCMAKE_EXE_LINKER_FLAGS="$CMAKE_EXE_LINKER_FLAGS -fstack-protector" \
-DCMAKE_SHARED_LINKER_FLAGS="$CMAKE_SHARED_LINKER_FLAGS" \
$EXTRA_CMAKE_FLAGS \
"${EXTRA_CMAKE_FLAGS_ARRAY[@]}" \
-S ..
cmake --build . --target install -- -j"$(nproc)"