Skip to content

Commit e79a841

Browse files
committed
reset to previous GHA
1 parent 0d6b74f commit e79a841

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/build_cross.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
toolchain: https://github.com/netboxlabs/pktvisor/releases/download/toolchains/x86_64-linux-musl-cross.tgz
2525
cc: x86_64-linux-musl-gcc
2626
cxx: x86_64-linux-musl-g++
27+
ldflags: "-static"
2728
# - arch: armv7lh # ARMv7 little-endian hard-float
2829
# conan_arch: armv7hf
2930
# toolchain: https://github.com/netboxlabs/pktvisor/releases/download/toolchains/armv7l-linux-musleabihf-cross.tgz
@@ -34,6 +35,7 @@ jobs:
3435
toolchain: https://github.com/netboxlabs/pktvisor/releases/download/toolchains/aarch64-linux-musl-cross.tgz
3536
cc: aarch64-linux-musl-gcc
3637
cxx: aarch64-linux-musl-g++
38+
ldflags: "-static"
3739
env:
3840
CC: gcc
3941
CXX: g++
@@ -110,6 +112,7 @@ jobs:
110112
[buildenv]
111113
CC=${{github.workspace}}/toolchain/bin/${{matrix.cc}}
112114
CXX=${{github.workspace}}/toolchain/bin/${{matrix.cxx}}
115+
LDFLAGS=${{matrix.ldflags}}
113116
EOF
114117
115118
- name: Setup Conan Cache
@@ -122,21 +125,20 @@ jobs:
122125
- name: Install dependencies
123126
working-directory: ${{github.workspace}}/src
124127
run: |
125-
conan install . -pr:b=default -pr:h="host" --build=missing -c="opentelemetry-cpp/*:tools.build:cxxflags=['-include','cstdint']"
128+
conan install . -pr:b=default -pr:h="host" --build=missing
126129
127130
- name: Configure
128131
working-directory: ${{github.workspace}}/src/build
129132
run: |
130133
export CC CXX
134+
export LDFLAGS=-static
131135
source Release/generators/conanbuild.sh
132136
cmake .. \
133137
-DCMAKE_BUILD_TYPE=Release \
134138
-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake/conan_provider.cmake \
135139
-DCONAN_HOST_PROFILE="host" \
136140
-DCONAN_INSTALL_ARGS=--build=never \
137141
-DCRASHPAD_NOT_SUPPORTED=true \
138-
-DBUILD_SHARED_LIBS=OFF \
139-
-DCMAKE_EXE_LINKER_FLAGS="-static" \
140142
-DCMAKE_C_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" -DCMAKE_CXX_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" \
141143
-DCORRADE_RC_PROGRAM=$(command -v corrade-rc) \
142144
-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic

0 commit comments

Comments
 (0)