try with simpler build for musl

rocksdict · Nov 2, 2024 · 3bf3bee · 3bf3bee
1 parent d2761f0
commit 3bf3bee
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 48 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -217,16 +217,6 @@ jobs:
           manylinux: musllinux_1_2
           args: --release --out dist --interpreter '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
           container: congyuwang/musllinux_1_2_x86_64:llvm-19.1.3
-        env:
-          LIBCLANG_PATH: /usr/local/lib
-          CC: /usr/local/bin/clang
-          CXX: /usr/local/bin/clang++
-          AR: /usr/local/bin/llvm-ar
-          CFLAGS: "-flto=thin -O3"
-          CXXFLAGS: "-flto=thin -O3"
-          RUSTFLAGS: "-Clinker-plugin-lto -Clinker=/usr/local/bin/clang -Clink-arg=-fuse-ld=/usr/local/bin/ld.lld"
-          # https://github.com/rust-lang/rust-bindgen/issues/2360#issuecomment-2367084230
-          LLVM_CONFIG_PATH: /root/llvm_config.sh
       - name: Install built wheel and test
         run: |
           pip install rocksdict --no-index --find-links dist --force-reinstall || true
@@ -345,16 +335,6 @@ jobs:
           manylinux: musllinux_1_2
           args: --release --out dist --interpreter '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
           container: congyuwang/musllinux_1_2_aarch64:llvm-19.1.3
-        env:
-          LIBCLANG_PATH: /usr/local/lib
-          CC: /usr/local/bin/clang
-          CXX: /usr/local/bin/clang++
-          AR: /usr/local/bin/llvm-ar
-          CFLAGS: "-flto=thin -O3"
-          CXXFLAGS: "-flto=thin -O3"
-          RUSTFLAGS: "-Clinker-plugin-lto -Clinker=/usr/local/bin/clang -Clink-arg=-fuse-ld=/usr/local/bin/ld.lld"
-          # https://github.com/rust-lang/rust-bindgen/issues/2360#issuecomment-2367084230
-          LLVM_CONFIG_PATH: /root/llvm_config.sh
       - name: Install built wheel and test
         run: |
           pip install rocksdict --no-index --find-links dist --force-reinstall || true

diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml
@@ -217,16 +217,6 @@ jobs:
           manylinux: musllinux_1_2
           args: --release --out dist --interpreter '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
           container: congyuwang/musllinux_1_2_x86_64:llvm-19.1.3
-        env:
-          LIBCLANG_PATH: /usr/local/lib
-          CC: /usr/local/bin/clang
-          CXX: /usr/local/bin/clang++
-          AR: /usr/local/bin/llvm-ar
-          CFLAGS: "-flto=thin -O3"
-          CXXFLAGS: "-flto=thin -O3"
-          RUSTFLAGS: "-Clinker-plugin-lto -Clinker=/usr/local/bin/clang -Clink-arg=-fuse-ld=/usr/local/bin/ld.lld"
-          # https://github.com/rust-lang/rust-bindgen/issues/2360#issuecomment-2367084230
-          LLVM_CONFIG_PATH: /root/llvm_config.sh
       - name: Install built wheel and test
         run: |
           pip install rocksdict --no-index --find-links dist --force-reinstall || true
@@ -345,16 +335,6 @@ jobs:
           manylinux: musllinux_1_2
           args: --release --out dist --interpreter '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
           container: congyuwang/musllinux_1_2_aarch64:llvm-19.1.3
-        env:
-          LIBCLANG_PATH: /usr/local/lib
-          CC: /usr/local/bin/clang
-          CXX: /usr/local/bin/clang++
-          AR: /usr/local/bin/llvm-ar
-          CFLAGS: "-flto=thin -O3"
-          CXXFLAGS: "-flto=thin -O3"
-          RUSTFLAGS: "-Clinker-plugin-lto -Clinker=/usr/local/bin/clang -Clink-arg=-fuse-ld=/usr/local/bin/ld.lld"
-          # https://github.com/rust-lang/rust-bindgen/issues/2360#issuecomment-2367084230
-          LLVM_CONFIG_PATH: /root/llvm_config.sh
       - name: Install built wheel and test
         run: |
           pip install rocksdict --no-index --find-links dist --force-reinstall || true

diff --git a/Cargo.toml b/Cargo.toml
@@ -27,14 +27,6 @@ libc = "0.2"
 version = "0.22"
 features = ["py-clone", "extension-module", "num-bigint"]
 
-# https://github.com/rust-lang/rust-bindgen/issues/2360#issuecomment-2367084230
-[build-dependencies]
-bindgen = { version = "0.70", default-features = false, features = [
-    "logging",
-    "prettyplease",
-    "static",
-] }
-
 [profile.release]
 codegen-units = 1
 debug = false