diff options
10 files changed, 11 insertions, 7 deletions
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index d4d11266a0..9b7fc1c7bd 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -39,7 +39,7 @@ GCC_VERSION=11.2.0 BINUTILS_VERSION=2.37 IASL_VERSION=20220331 # CLANG version number -CLANG_VERSION=14.0.6 +CLANG_VERSION=15.0.0 CMAKE_VERSION=3.24.2 NASM_VERSION=2.15.05 @@ -58,12 +58,13 @@ LLVM_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${C CLANG_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-${CLANG_VERSION}.src.tar.xz" CRT_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/compiler-rt-${CLANG_VERSION}.src.tar.xz" CTE_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-tools-extra-${CLANG_VERSION}.src.tar.xz" +LLVMCMAKE_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/cmake-${CLANG_VERSION}.src.tar.xz" CMAKE_ARCHIVE="https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSION}.tar.gz" NASM_ARCHIVE="https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2" ALL_ARCHIVES="$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE \ $GCC_ARCHIVE $BINUTILS_ARCHIVE $IASL_ARCHIVE \ - $LLVM_ARCHIVE $CLANG_ARCHIVE \ + $LLVM_ARCHIVE $CLANG_ARCHIVE $LLVMCMAKE_ARCHIVE \ $CRT_ARCHIVE $CTE_ARCHIVE $CMAKE_ARCHIVE $NASM_ARCHIVE" # GCC toolchain directories @@ -80,6 +81,7 @@ LLVM_DIR="llvm-${CLANG_VERSION}.src" CLANG_DIR="clang-${CLANG_VERSION}.src" CRT_DIR="compiler-rt-${CLANG_VERSION}.src" CTE_DIR="clang-tools-extra-${CLANG_VERSION}.src" +LLVMCMAKE_DIR="cmake-${CLANG_VERSION}.src" CMAKE_DIR="cmake-${CMAKE_VERSION}" NASM_DIR="nasm-${NASM_VERSION}" @@ -806,6 +808,7 @@ build_LLVM() { ln -nsf "$CLANG_DIR" ../clang ln -nsf "$CTE_DIR" ../clang-tools-extra ln -nsf "$CRT_DIR" ../compiler-rt + ln -nsf "$LLVMCMAKE_DIR" ../cmake $CMAKE -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$DESTDIR$TARGETDIR" \ -DCLANG_VENDOR="coreboot toolchain v$CROSSGCC_VERSION - " \ @@ -956,7 +959,7 @@ case "$PACKAGE" in CLANG|clang) NAME="LLVM clang" LLVM_VERSION=${CLANG_VERSION} - PACKAGES="CMAKE LLVM CLANG CRT CTE" + PACKAGES="CMAKE LLVM CLANG CRT CTE LLVMCMAKE" CMAKE=${DESTDIR}${TARGETDIR}/bin/cmake ;; IASL|iasl) diff --git a/util/crossgcc/sum/clang-14.0.6.src.tar.xz.cksum b/util/crossgcc/sum/clang-14.0.6.src.tar.xz.cksum deleted file mode 100644 index fbef3e1d9b..0000000000 --- a/util/crossgcc/sum/clang-14.0.6.src.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -88442d295bc0b96df7cf3d526ed9eabd7a214ac2 tarballs/clang-14.0.6.src.tar.xz diff --git a/util/crossgcc/sum/clang-15.0.0.src.tar.xz.cksum b/util/crossgcc/sum/clang-15.0.0.src.tar.xz.cksum new file mode 100644 index 0000000000..b83f55cc8f --- /dev/null +++ b/util/crossgcc/sum/clang-15.0.0.src.tar.xz.cksum @@ -0,0 +1 @@ +7b47dbb51bd2de28174d8425f4fe9523880bc7b8 tarballs/clang-15.0.0.src.tar.xz diff --git a/util/crossgcc/sum/clang-tools-extra-14.0.6.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-14.0.6.src.tar.xz.cksum deleted file mode 100644 index e816ec2b18..0000000000 --- a/util/crossgcc/sum/clang-tools-extra-14.0.6.src.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -dac5046f0eb81e6c47432cf80229599befbf273e tarballs/clang-tools-extra-14.0.6.src.tar.xz diff --git a/util/crossgcc/sum/clang-tools-extra-15.0.0.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-15.0.0.src.tar.xz.cksum new file mode 100644 index 0000000000..58fa9d88d7 --- /dev/null +++ b/util/crossgcc/sum/clang-tools-extra-15.0.0.src.tar.xz.cksum @@ -0,0 +1 @@ +65c804e2539753ab350a0960b378ce66bc57b0e9 tarballs/clang-tools-extra-15.0.0.src.tar.xz diff --git a/util/crossgcc/sum/cmake-15.0.0.src.tar.xz.cksum b/util/crossgcc/sum/cmake-15.0.0.src.tar.xz.cksum new file mode 100644 index 0000000000..4bf97ee2af --- /dev/null +++ b/util/crossgcc/sum/cmake-15.0.0.src.tar.xz.cksum @@ -0,0 +1 @@ +56ca883308b1b30cb981c86038eb677db9cc8eb5 tarballs/cmake-15.0.0.src.tar.xz diff --git a/util/crossgcc/sum/compiler-rt-14.0.6.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-14.0.6.src.tar.xz.cksum deleted file mode 100644 index 5b4f25b4f3..0000000000 --- a/util/crossgcc/sum/compiler-rt-14.0.6.src.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -91f03b578aff0fda6b9d3e2185e6ea5e588c6d47 tarballs/compiler-rt-14.0.6.src.tar.xz diff --git a/util/crossgcc/sum/compiler-rt-15.0.0.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-15.0.0.src.tar.xz.cksum new file mode 100644 index 0000000000..add3a4414c --- /dev/null +++ b/util/crossgcc/sum/compiler-rt-15.0.0.src.tar.xz.cksum @@ -0,0 +1 @@ +15879f50459c7b2e7b5fb77c6b845c39c91a04fc tarballs/compiler-rt-15.0.0.src.tar.xz diff --git a/util/crossgcc/sum/llvm-14.0.6.src.tar.xz.cksum b/util/crossgcc/sum/llvm-14.0.6.src.tar.xz.cksum deleted file mode 100644 index 4e1de3efa1..0000000000 --- a/util/crossgcc/sum/llvm-14.0.6.src.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -975020d4f7164d84a89f0f9b2153dd870d06e02d tarballs/llvm-14.0.6.src.tar.xz diff --git a/util/crossgcc/sum/llvm-15.0.0.src.tar.xz.cksum b/util/crossgcc/sum/llvm-15.0.0.src.tar.xz.cksum new file mode 100644 index 0000000000..0e033aaef2 --- /dev/null +++ b/util/crossgcc/sum/llvm-15.0.0.src.tar.xz.cksum @@ -0,0 +1 @@ +6f7f53d45ae8d207a6d72fd8ac380160f240d37e tarballs/llvm-15.0.0.src.tar.xz |