Skip to content

Commit 471b470

Browse files
committed
fix: fix musl arm test
1 parent d686eff commit 471b470

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.github/workflows/build_musllinux_arm64_wheels.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,6 @@ jobs:
254254
python -m pip install dist/*.whl --force-reinstall
255255
echo "Installation completed at: $(date)"
256256
257-
echo "Verifying chdb installation..."
258-
python -c "import chdb; print(f'chdb imported successfully'); print(f'chdb version: {getattr(chdb, '__version__', 'unknown')}')"
259-
260257
echo "Running basic query test..."
261258
python -c "import chdb; res = chdb.query('select 1112222222,555', 'CSV'); print(f'Python $version: {res}')"
262259
@@ -361,6 +358,7 @@ jobs:
361358

362359
# Upload artifacts
363360
- name: Upload build artifacts
361+
if: always()
364362
uses: actions/upload-artifact@v4
365363
with:
366364
name: chdb-artifacts-musllinux-aarch64

contrib/pybind11-cmake/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ if(Python_FOUND)
7676
target_include_directories(${PYBIND11_NONLIMITEDAPI_LIBNAME} PRIVATE ${PYBIND11_INCLUDE_DIR})
7777
target_include_directories(${PYBIND11_NONLIMITEDAPI_LIBNAME} PRIVATE ${Python_INCLUDE_DIRS})
7878
target_link_libraries(${PYBIND11_NONLIMITEDAPI_LIBNAME} PUBLIC ch_contrib::pybind11_stubs)
79+
80+
if (USE_MUSL AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
81+
target_link_libraries(${PYBIND11_NONLIMITEDAPI_LIBNAME} PRIVATE -lgcc)
82+
message(STATUS "Linking libgcc for ARM64+musl to provide compiler runtime symbols")
83+
endif()
84+
7985
if (APPLE)
8086
target_link_options(${PYBIND11_NONLIMITEDAPI_LIBNAME} PRIVATE -undefined dynamic_lookup)
8187
else()

programs/local/chdb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "chdb-internal.h"
99

1010
#if defined(USE_MUSL) && defined(__aarch64__)
11-
void musl_compile_stub(int arg)
11+
void chdb_musl_compile_stub(int arg)
1212
{
1313
jmp_buf buf1;
1414
sigjmp_buf buf2;

0 commit comments

Comments
 (0)