Skip to content

Commit 1190956

Browse files
committed
try to fix build
1 parent 84e370b commit 1190956

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

.github/workflows/build_cross.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/x86_64-unknown-linux-musl.tar.xz
2525
cc: x86_64-unknown-linux-musl-gcc
2626
cxx: x86_64-unknown-linux-musl-g++
27-
ldflags: "-static"
2827
# - arch: armv7lh # ARMv7 little-endian hard-float
2928
# conan_arch: armv7hf
3029
# toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/armv7-unknown-linux-musleabihf.tar.xz
@@ -35,7 +34,6 @@ jobs:
3534
toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/aarch64-unknown-linux-musl.tar.xz
3635
cc: aarch64-unknown-linux-musl-gcc
3736
cxx: aarch64-unknown-linux-musl-g++
38-
ldflags: "-static"
3937
env:
4038
CC: gcc
4139
CXX: g++
@@ -112,7 +110,6 @@ jobs:
112110
[buildenv]
113111
CC=${{github.workspace}}/toolchain/bin/${{matrix.cc}}
114112
CXX=${{github.workspace}}/toolchain/bin/${{matrix.cxx}}
115-
LDFLAGS=${{matrix.ldflags}}
116113
EOF
117114
118115
- name: Setup Conan Cache
@@ -131,14 +128,15 @@ jobs:
131128
working-directory: ${{github.workspace}}/src/build
132129
run: |
133130
export CC CXX
134-
export LDFLAGS=-static
135131
source Release/generators/conanbuild.sh
136132
cmake .. \
137133
-DCMAKE_BUILD_TYPE=Release \
138134
-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake/conan_provider.cmake \
139135
-DCONAN_HOST_PROFILE="host" \
140136
-DCONAN_INSTALL_ARGS=--build=never \
141137
-DCRASHPAD_NOT_SUPPORTED=true \
138+
-DBUILD_SHARED_LIBS=OFF \
139+
-DCMAKE_EXE_LINKER_FLAGS="-static" \
142140
-DCMAKE_C_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" -DCMAKE_CXX_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" \
143141
-DCORRADE_RC_PROGRAM=$(command -v corrade-rc) \
144142
-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic

0 commit comments

Comments
 (0)