Skip to content

Commit

Permalink
Merge pull request #193 from abeimler/fix/cross-arm-c-build
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya authored Jan 20, 2023
2 parents 3d0e129 + c9be40e commit 45f3998
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.cross.arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
install-cross-compiler: g++-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
target: aarch64-linux-gnu
- task: rpi3:build.cross
install-cross-compiler: gcc-arm-none-eabi binutils-arm-none-eabi
install-cross-compiler: gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi
target: arm-none-eabi
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.arm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ FROM base AS setup
RUN setup-cpp --clangtidy true --clangformat true --cmake true --ninja true --ccache true --cppcheck true --vcpkg true --conan true --task true

RUN apt-get update && apt-get install -y \
gcc-arm-none-eabi binutils-arm-none-eabi \
gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi \
&& rm -rf /var/lib/apt/lists/*

COPY ./docker/entrypoint.sh /docker-entrypoint.sh
Expand Down

0 comments on commit 45f3998

Please sign in to comment.