You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2023/11/26 11:50:00 UTC
(nuttx) branch master updated: tools/ci: Upgrade clang arm toolchain to 17.0.1
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new d30daa54b0 tools/ci: Upgrade clang arm toolchain to 17.0.1
d30daa54b0 is described below
commit d30daa54b04a62f09189a8297e6158acf7605762
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 26 11:43:00 2023 +0800
tools/ci: Upgrade clang arm toolchain to 17.0.1
from https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/tag/release-17.0.1
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
tools/ci/cibuild.sh | 10 +++++-----
tools/ci/docker/linux/Dockerfile | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
index 978ec02ed0..02b8177cf0 100755
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@@ -46,15 +46,15 @@ function arm-clang-toolchain {
local flavor
case ${os} in
Linux)
- flavor=linux
+ flavor=Linux
;;
esac
cd "${tools}"
- curl -O -L -s https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-14.0.0/LLVMEmbeddedToolchainForArm-14.0.0-${flavor}.tar.gz
- tar zxf LLVMEmbeddedToolchainForArm-14.0.0-${flavor}.tar.gz
- mv LLVMEmbeddedToolchainForArm-14.0.0 clang-arm-none-eabi
+ curl -O -L -s https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-17.0.1/LLVMEmbeddedToolchainForArm-17.0.1-${flavor}-x86_64.tar.xz
+ xz -d LLVMEmbeddedToolchainForArm-17.0.1-${flavor}.tar.xz
+ mv LLVMEmbeddedToolchainForArm-17.0.1 clang-arm-none-eabi
cp /usr/bin/clang-extdef-mapping-10 clang-arm-none-eabi/bin/clang-extdef-mapping
- rm LLVMEmbeddedToolchainForArm-14.0.0-${flavor}.tar.gz
+ rm LLVMEmbeddedToolchainForArm-17.0.1-${flavor}.tar.xz
fi
command clang --version
diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile
index a0e371477b..07bcf485cc 100644
--- a/tools/ci/docker/linux/Dockerfile
+++ b/tools/ci/docker/linux/Dockerfile
@@ -79,8 +79,8 @@ WORKDIR /tools
FROM nuttx-toolchain-base AS nuttx-toolchain-arm
# Download the latest ARM clang toolchain prebuilt by ARM
RUN mkdir clang-arm-none-eabi && \
- curl -s -L "https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-14.0.0/LLVMEmbeddedToolchainForArm-14.0.0-linux.tar.gz" \
- | tar -C clang-arm-none-eabi --strip-components 1 -xz
+ curl -s -L "https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-17.0.1/LLVMEmbeddedToolchainForArm-17.0.1-Linux-x86_64.tar.xz" \
+ | tar -C clang-arm-none-eabi --strip-components 1 -xJ
# Download the latest ARM GCC toolchain prebuilt by ARM
RUN mkdir gcc-arm-none-eabi && \