Skip to content

Commit 4879afb

Browse files
etan-statusetan-status
authored
Cleanup libunwind remnants (#7097)
libunwind is always vendored, we don't need to explicitly mention `USE_VENDORED_LIBUNWIND=1` anymore.
1 parent 71cb717 commit 4879afb

File tree

3 files changed

+51
-48
lines changed

3 files changed

+51
-48
lines changed

‎.github/workflows/nightly_build.yml‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ jobs:
5252
- name: Upload BN checksum artefact
5353
uses: actions/upload-artifact@v4
5454
with:
55-
name: Linux_amd64_checksum
55+
name: Linux_amd64_checksum_bn
5656
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
5757
retention-days: 2
5858

5959
- name: Upload VC checksum artefact
6060
uses: actions/upload-artifact@v4
6161
with:
62-
name: Linux_amd64_checksum
62+
name: Linux_amd64_checksum_vc
6363
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
6464
retention-days: 2
6565

@@ -106,14 +106,14 @@ jobs:
106106
- name: Upload BN checksum artefact
107107
uses: actions/upload-artifact@v4
108108
with:
109-
name: Linux_arm64_checksum
109+
name: Linux_arm64_checksum_bn
110110
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
111111
retention-days: 2
112112

113113
- name: Upload VC checksum artefact
114114
uses: actions/upload-artifact@v4
115115
with:
116-
name: Linux_arm64_checksum
116+
name: Linux_arm64_checksum_vc
117117
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
118118
retention-days: 2
119119

@@ -160,14 +160,14 @@ jobs:
160160
- name: Upload BN checksum artefact
161161
uses: actions/upload-artifact@v4
162162
with:
163-
name: Linux_arm_checksum
163+
name: Linux_arm_checksum_bn
164164
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
165165
retention-days: 2
166166

167167
- name: Upload VC checksum artefact
168168
uses: actions/upload-artifact@v4
169169
with:
170-
name: Linux_arm_checksum
170+
name: Linux_arm_checksum_vc
171171
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
172172
retention-days: 2
173173

@@ -206,14 +206,14 @@ jobs:
206206
- name: Upload BN checksum artefact
207207
uses: actions/upload-artifact@v4
208208
with:
209-
name: Windows_amd64_checksum
209+
name: Windows_amd64_checksum_bn
210210
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
211211
retention-days: 2
212212

213213
- name: Upload VC checksum artefact
214214
uses: actions/upload-artifact@v4
215215
with:
216-
name: Windows_amd64_checksum
216+
name: Windows_amd64_checksum_vc
217217
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
218218
retention-days: 2
219219

@@ -252,14 +252,14 @@ jobs:
252252
- name: Upload BN checksum artefact
253253
uses: actions/upload-artifact@v4
254254
with:
255-
name: macOS_amd64_checksum
255+
name: macOS_amd64_checksum_bn
256256
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
257257
retention-days: 2
258258

259259
- name: Upload VC checksum artefact
260260
uses: actions/upload-artifact@v4
261261
with:
262-
name: macOS_amd64_checksum
262+
name: macOS_amd64_checksum_vc
263263
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
264264
retention-days: 2
265265

@@ -298,14 +298,14 @@ jobs:
298298
- name: Upload BN checksum artefact
299299
uses: actions/upload-artifact@v4
300300
with:
301-
name: macOS_arm64_checksum
301+
name: macOS_arm64_checksum_bn
302302
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
303303
retention-days: 2
304304

305305
- name: Upload VC checksum artefact
306306
uses: actions/upload-artifact@v4
307307
with:
308-
name: macOS_arm64_checksum
308+
name: macOS_arm64_checksum_vc
309309
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
310310
retention-days: 2
311311

@@ -330,17 +330,23 @@ jobs:
330330
\`\`\`text
331331
EOF
332332
echo '# Linux AMD64' >> release_notes.md
333-
cat Linux_amd64_checksum/* >> release_notes.md
333+
cat Linux_amd64_checksum_bn/* >> release_notes.md
334+
cat Linux_amd64_checksum_vc/* >> release_notes.md
334335
echo '# Linux ARM64' >> release_notes.md
335-
cat Linux_arm64_checksum/* >> release_notes.md
336+
cat Linux_arm64_checksum_bn/* >> release_notes.md
337+
cat Linux_arm64_checksum_vc/* >> release_notes.md
336338
echo '# Linux ARM' >> release_notes.md
337-
cat Linux_arm_checksum/* >> release_notes.md
339+
cat Linux_arm_checksum_bn/* >> release_notes.md
340+
cat Linux_arm_checksum_vc/* >> release_notes.md
338341
echo '# Windows AMD64' >> release_notes.md
339-
cat Windows_amd64_checksum/* >> release_notes.md
342+
cat Windows_amd64_checksum_bn/* >> release_notes.md
343+
cat Windows_amd64_checksum_vc/* >> release_notes.md
340344
echo '# macOS AMD64' >> release_notes.md
341-
cat macOS_amd64_checksum/* >> release_notes.md
345+
cat macOS_amd64_checksum_bn/* >> release_notes.md
346+
cat macOS_amd64_checksum_vc/* >> release_notes.md
342347
echo '# macOS ARM64' >> release_notes.md
343-
cat macOS_arm64_checksum/* >> release_notes.md
348+
cat macOS_arm64_checksum_bn/* >> release_notes.md
349+
cat macOS_arm64_checksum_vc/* >> release_notes.md
344350
echo '```' >> release_notes.md
345351
346352
- name: Delete tag
@@ -370,14 +376,20 @@ jobs:
370376
failOnError: false
371377
name: |
372378
Linux_amd64_archive
373-
Linux_amd64_checksum
379+
Linux_amd64_checksum_bn
380+
Linux_amd64_checksum_vc
374381
Linux_arm64_archive
375-
Linux_arm64_checksum
382+
Linux_arm64_checksum_bn
383+
Linux_arm64_checksum_vc
376384
Linux_arm_archive
377-
Linux_arm_checksum
385+
Linux_arm_checksum_bn
386+
Linux_arm_checksum_vc
378387
Windows_amd64_archive
379-
Windows_amd64_checksum
388+
Windows_amd64_checksum_bn
389+
Windows_amd64_checksum_vc
380390
macOS_amd64_archive
381-
macOS_amd64_checksum
391+
macOS_amd64_checksum_bn
392+
macOS_amd64_checksum_vc
382393
macOS_arm64_archive
383-
macOS_arm64_checksum
394+
macOS_arm64_checksum_bn
395+
macOS_arm64_checksum_vc

‎.github/workflows/release.yml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2020-2024 Status Research & Development GmbH
2+
# Copyright (c) 2020-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -432,20 +432,26 @@ jobs:
432432
failOnError: false
433433
name: |
434434
Linux_amd64_archive
435-
Linux_amd64_checksum
435+
Linux_amd64_checksum_bn
436+
Linux_amd64_checksum_vc
436437
Linux_amd64_packages
437438
Linux_arm64_archive
438-
Linux_arm64_checksum
439+
Linux_arm64_checksum_bn
440+
Linux_arm64_checksum_vc
439441
Linux_arm64_packages
440442
Linux_arm_archive
441-
Linux_arm_checksum
443+
Linux_arm_checksum_bn
444+
Linux_arm_checksum_vc
442445
Linux_arm_packages
443446
Windows_amd64_archive
444-
Windows_amd64_checksum
447+
Windows_amd64_checksum_bn
448+
Windows_amd64_checksum_vc
445449
macOS_amd64_archive
446-
macOS_amd64_checksum
450+
macOS_amd64_checksum_bn
451+
macOS_amd64_checksum_vc
447452
macOS_arm64_archive
448-
macOS_arm64_checksum
453+
macOS_arm64_checksum_bn
454+
macOS_arm64_checksum_vc
449455
450456
- name: Login to Docker Hub
451457
uses: docker/login-action@v1

‎docker/dist/entry_point.sh‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,12 @@ if [[ "${PLATFORM}" == "Windows_amd64" ]]; then
6363
CC="${CC}" \
6464
CFLAGS="-Wall -Os -fPIC -DWIN32 -DNATPMP_STATICLIB -DENABLE_STRNATPMPERR -DNATPMP_MAX_RETRIES=4 ${CFLAGS}" \
6565
libnatpmp.a &>/dev/null
66-
# We set CXX and add CXXFLAGS for libunwind's C++ code, even though we don't
67-
# use those C++ objects. I don't see an easy way of disabling the C++ parts in
68-
# libunwind itself.
69-
#
70-
# "libunwind.a" combines objects produced from C and C++ code. Even though we
71-
# don't link any C++-generated objects, the linker still checks them for
72-
# undefined symbols, so we're forced to use g++ as a linker wrapper.
73-
# For some reason, macOS's Clang doesn't need this trick, nor do native (and
74-
# newer) Mingw-w64 toolchains on Windows.
75-
#
7666
# nim-blscurve's Windows SSSE3 detection doesn't work when cross-compiling,
7767
# so we enable it here.
7868
make \
79-
CC="${CC}" \
80-
CXX="${CXX}" \
81-
CXXFLAGS="${CXXFLAGS} -D__STDC_FORMAT_MACROS -D_WIN32_WINNT=0x0600" \
82-
USE_VENDORED_LIBUNWIND=1 \
8369
LOG_LEVEL="TRACE" \
84-
NIMFLAGS="${NIMFLAGS_COMMON} --os:windows --gcc.exe=${CC} --gcc.linkerexe=${CXX} --passL:-static -d:BLSTuseSSSE3=1" \
70+
CC="${CC}" \
71+
NIMFLAGS="${NIMFLAGS_COMMON} --os:windows --gcc.exe=${CC} --gcc.linkerexe=${CC} --passL:-static -d:BLSTuseSSSE3=1" \
8572
${BINARIES}
8673
elif [[ "${PLATFORM}" == "Linux_arm32v7" ]]; then
8774
CC="arm-linux-gnueabihf-gcc"
@@ -143,7 +130,6 @@ elif [[ "${PLATFORM}" == "macOS_amd64" ]]; then
143130
RANLIB="x86_64-apple-darwin${DARWIN_VER}-ranlib" \
144131
DSYMUTIL="x86_64-apple-darwin${DARWIN_VER}-dsymutil" \
145132
FORCE_DSYMUTIL=1 \
146-
USE_VENDORED_LIBUNWIND=1 \
147133
NIMFLAGS="${NIMFLAGS_COMMON} --os:macosx --clang.exe=${CC} --clang.linkerexe=${CC}" \
148134
${BINARIES}
149135
elif [[ "${PLATFORM}" == "macOS_arm64" ]]; then
@@ -174,7 +160,6 @@ elif [[ "${PLATFORM}" == "macOS_arm64" ]]; then
174160
RANLIB="arm64-apple-darwin${DARWIN_VER}-ranlib" \
175161
DSYMUTIL="arm64-apple-darwin${DARWIN_VER}-dsymutil" \
176162
FORCE_DSYMUTIL=1 \
177-
USE_VENDORED_LIBUNWIND=1 \
178163
NIMFLAGS="${NIMFLAGS_COMMON} --os:macosx --cpu:arm64 --passC:'-mcpu=apple-a13' --passL:'-mcpu=apple-a13' --clang.exe=${CC} --clang.linkerexe=${CC}" \
179164
${BINARIES}
180165
elif [[ "${PLATFORM}" == "Linux_amd64_opt" ]]; then

0 commit comments

Comments
 (0)