remove musl related code

Yikai-Liao · Sep 18, 2024 · 04dfacc · 04dfacc
1 parent a5c74d8
commit 04dfacc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 29 deletions.
diff --git a/.github/workflows/test_wheel.yml b/.github/workflows/test_wheel.yml
@@ -13,16 +13,15 @@ jobs:
         # Github Actions doesn't support pairing matrix values together, let's improvise
         # https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
         buildplat:
-#          - [ubuntu-22.04, manylinux_x86_64]
+          - [ubuntu-22.04, manylinux_x86_64]
           - [ubuntu-22.04, musllinux_x86_64]
-#          - [ubuntu-22.04, manylinux_aarch64]
-#          - [ubuntu-22.04, musllinux_aarch64]
-#          - [macos-12, macosx_x86_64]
-#          - [macos-12, macosx_arm64]
-#          - [windows-2022, win_amd64]
-#          - [windows-2022, win32]
-#        python: ["cp38", "cp39", "cp310", "cp311", "cp312", "pp39"]
-        python: ["cp310"]
+          - [ubuntu-22.04, manylinux_aarch64]
+          - [ubuntu-22.04, musllinux_aarch64]
+          - [macos-12, macosx_x86_64]
+          - [macos-12, macosx_arm64]
+          - [windows-2022, win_amd64]
+          - [windows-2022, win32]
+        python: ["cp38", "cp39", "cp310", "cp311", "cp312", "pp39"]
         exclude:
           - buildplat: [windows-2022, win32]
             python: "pp39"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -66,26 +66,6 @@ if(BUILD_SYMUSIC_PY)
         NB_DOMAIN symusic
         py_src/core.cpp py_src/py_utils.h py_src/bind_vector_copy.h
     )
-    if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-        find_library(MUSL_LIB musl)
-        # Static Link to MUSL for Linux if MUSL is detected
-        if (MUSL_LIB)
-            message(STATUS "MUSL detected, static link to musl")
-
-            set_target_properties(core PROPERTIES LINK_SEARCH_START_STATIC 1)
-            set_target_properties(core PROPERTIES LINK_SEARCH_END_STATIC 1)
-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -static-libgcc -static-libstdc++")
-            target_link_libraries(core PRIVATE ${MUSL_LIB})
-
-            set_target_properties(abc2midi PROPERTIES LINK_SEARCH_START_STATIC 1)
-            set_target_properties(abc2midi PROPERTIES LINK_SEARCH_END_STATIC 1)
-            target_link_libraries(abc2midi PRIVATE ${MUSL_LIB})
-
-            set_target_properties(midi2abc PROPERTIES LINK_SEARCH_START_STATIC 1)
-            set_target_properties(midi2abc PROPERTIES LINK_SEARCH_END_STATIC 1)
-            target_link_libraries(midi2abc PRIVATE ${MUSL_LIB})
-        endif()
-    endif()
     target_link_libraries(core PRIVATE symusic)
 
     install(TARGETS core LIBRARY DESTINATION symusic)