Merge remote-tracking branch 'zsl/build-packages-cpack' into build-pa…

…ckages-cpack
eclipse-zenoh · Oct 24, 2024 · 31257f2 · 31257f2
2 parents cfa38c6 + 76b97ec
commit 31257f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -3,6 +3,7 @@ rustflags = "-Ctarget-feature=-crt-static"
 
 [target.aarch64-unknown-linux-musl]
 rustflags = "-Ctarget-feature=-crt-static"
+linker = "aarch64-linux-musl-gcc"
 
 [target.arm-unknown-linux-gnueabihf]
 linker = "arm-linux-gnueabihf-gcc"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -101,7 +101,6 @@ jobs:
       - name: Add rust toolchain
         run: |
           rustup target add ${{ matrix.build.target }}
-          rustup set default-host ${{ matrix.build.target }}
 
       - name: Install build deps
         if: ${{ matrix.build.target == 'x86_64-unknown-linux-musl'}}
@@ -124,10 +123,15 @@ jobs:
 
       - name: Install build deps
         if: ${{ matrix.build.target == 'aarch64-unknown-linux-musl'}}
-        run: sudo apt-get install -y musl-tools
+        run: |
+          wget https://musl.cc/aarch64-linux-musl-cross.tgz
+          tar xvfz aarch64-linux-musl-cross.tgz
 
       - id: build
         run: |
+          if [[ ${{ matrix.build.target}} == 'aarch64-unknown-linux-musl' ]]; then
+            export PATH=$(PWD)/aarch64-linux-musl-cross/bin/:$PATH
+          fi
           mkdir -p build  && cd build
           cmake .. -DZENOHC_CUSTOM_TARGET=${{ matrix.build.target }} -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DZENOHC_BUILD_WITH_UNSTABLE_API=ON -DZENOHC_BUILD_WITH_SHARED_MEMORY=ON
           cmake --build . --config Release