fix linux-cross CI

rocksdict · Mar 2, 2024 · 441cba9 · 441cba9
1 parent 45a4078
commit 441cba9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -203,12 +203,13 @@ jobs:
           container: congyuwang/manylinux_2_28_aarch64:llvm-17.0.6
         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"
+          CC_aarch64_unknown_linux_gnu: /usr/local/bin/clang
+          CXX_aarch64_unknown_linux_gnu: /usr/local/bin/clang++
+          AR_aarch64_unknown_linux_gnu: /usr/local/bin/llvm-ar
+          CFLAGS_aarch64_unknown_linux_gnu: "-flto=thin -O3 --sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/"
+          CXXFLAGS_aarch64_unknown_linux_gnu: "-flto=thin -O3 --sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/"
+          CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: "/usr/local/bin/clang"
+          CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS: "-Clinker-plugin-lto -Clinker=/usr/local/bin/clang -Clink-arg=-fuse-ld=/usr/local/bin/ld.lld -Clink-arg=--sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/"
       - uses: uraimo/run-on-arch-action@v2
         name: Install built wheel and test
         with:

diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml
@@ -203,12 +203,13 @@ jobs:
           container: congyuwang/manylinux_2_28_aarch64:llvm-17.0.6
         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"
+          CC_aarch64_unknown_linux_gnu: /usr/local/bin/clang
+          CXX_aarch64_unknown_linux_gnu: /usr/local/bin/clang++
+          AR_aarch64_unknown_linux_gnu: /usr/local/bin/llvm-ar
+          CFLAGS_aarch64_unknown_linux_gnu: "-flto=thin -O3 --sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/"
+          CXXFLAGS_aarch64_unknown_linux_gnu: "-flto=thin -O3 --sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/"
+          CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: "/usr/local/bin/clang"
+          CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS: "-Clinker-plugin-lto -Clinker=/usr/local/bin/clang -Clink-arg=-fuse-ld=/usr/local/bin/ld.lld -Clink-arg=--sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/"
       - uses: uraimo/run-on-arch-action@v2
         name: Install built wheel and test
         with: