Skip to content

Commit

Permalink
Merge remote-tracking branch 'zsl/build-packages-cpack' into build-pa…
Browse files Browse the repository at this point in the history
…ckages-cpack
  • Loading branch information
milyin committed Oct 24, 2024
2 parents e655e6b + dbb4d4d commit 317c04f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ linker = "arm-linux-gnueabihf-gcc"
linker = "arm-linux-gnueabi-gcc"

[target.arm7-unknown-linux-gnueabihf]
linker = "armv7-linux-gnueabihf-gcc"
linker = "arm-linux-gnueabihf-gcc"

[target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc"
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,14 @@ jobs:
tar xvfz aarch64-linux-musl-cross.tgz
- id: build
shell: bash
run: |
toolchain_file=$(readlink -f TC-${{ matrix.build.target }}.cmake)
if [[ "${{ matrix.build.target }}" == "aarch64-unknown-linux-musl" ]]; then
export PATH=$PATH:$(readlink -f aarch64-linux-musl-cross)/bin
fi
mkdir -p build && cd build
cmake .. -DZENOHC_CUSTOM_TARGET=${{ matrix.build.target }} -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace}}/TC-${{ matrix.build.target }}.cmake" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DZENOHC_BUILD_WITH_UNSTABLE_API=ON -DZENOHC_BUILD_WITH_SHARED_MEMORY=ON
cmake .. -DZENOHC_CUSTOM_TARGET=${{ matrix.build.target }} -DCMAKE_TOOLCHAIN_FILE="${toolchain_file}" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DZENOHC_BUILD_WITH_UNSTABLE_API=ON -DZENOHC_BUILD_WITH_SHARED_MEMORY=ON
cmake --build . --config Release
cpack -C Release -G ZIP
Expand Down
4 changes: 2 additions & 2 deletions TC-armv7-unknown-linux-gnueabihf.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_PROCESSOR armv7)
set(ZENOHC_CUSTOM_TARGET armv7-unknown-linux-gnueabihf)
set(CMAKE_C_COMPILER armv7-linux-gnueabihf-gcc)
set(CMAKE_CXX_COMPILER armv7-linux-gnueabihf-g++)
set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)

0 comments on commit 317c04f

Please sign in to comment.