diff options
| -rwxr-xr-x | util/crossgcc/buildgcc | 20 | ||||
| -rw-r--r-- | util/crossgcc/sum/clang-11.0.0.src.tar.xz.cksum | 1 | ||||
| -rw-r--r-- | util/crossgcc/sum/clang-12.0.0.src.tar.xz.cksum | 1 | ||||
| -rw-r--r-- | util/crossgcc/sum/clang-tools-extra-11.0.0.src.tar.xz.cksum | 1 | ||||
| -rw-r--r-- | util/crossgcc/sum/clang-tools-extra-12.0.0.src.tar.xz.cksum | 1 | ||||
| -rw-r--r-- | util/crossgcc/sum/cmake-3.18.1.tar.gz.cksum | 1 | ||||
| -rw-r--r-- | util/crossgcc/sum/cmake-3.20.3.tar.gz.cksum | 1 | ||||
| -rw-r--r-- | util/crossgcc/sum/compiler-rt-11.0.0.src.tar.xz.cksum | 1 | ||||
| -rw-r--r-- | util/crossgcc/sum/compiler-rt-12.0.0.src.tar.xz.cksum | 1 | ||||
| -rw-r--r-- | util/crossgcc/sum/llvm-11.0.0.src.tar.xz.cksum | 1 | ||||
| -rw-r--r-- | util/crossgcc/sum/llvm-12.0.0.src.tar.xz.cksum | 1 |
11 files changed, 16 insertions, 14 deletions
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 3c8b1a8728..e3db60d683 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -43,8 +43,8 @@ IASL_VERSION=20210331 PYTHON_VERSION=3.8.5 EXPAT_VERSION=2.2.9 # CLANG version number -CLANG_VERSION=11.0.0 -CMAKE_VERSION=3.18.1 +CLANG_VERSION=12.0.0 +CMAKE_VERSION=3.20.3 NASM_VERSION=2.15.05 # GCC toolchain archive locations @@ -65,7 +65,7 @@ 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" -CMAKE_ARCHIVE="https://cmake.org/files/v3.18/cmake-${CMAKE_VERSION}.tar.gz" +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 \ @@ -850,19 +850,21 @@ build_IASL() { build_LLVM() { - cd .. || exit 1 - ln -sf "$PWD/$CLANG_DIR" "$LLVM_DIR/tools/clang" - ln -sf "$PWD/$CTE_DIR" "$LLVM_DIR/tools/clang/tools/extra" - ln -sf "$PWD/$CRT_DIR" "$LLVM_DIR/projects/compiler-rt" - cd - || exit 1 + ln -nsf "$LLVM_DIR" ../llvm + ln -nsf "$CLANG_DIR" ../clang + ln -nsf "$CTE_DIR" ../clang-tools-extra + ln -nsf "$CRT_DIR" ../compiler-rt $CMAKE -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$DESTDIR$TARGETDIR" \ -DCLANG_VENDOR="coreboot toolchain v$CROSSGCC_VERSION - " \ - -DCMAKE_BUILD_TYPE=Release ../$LLVM_DIR || touch .failed + -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt" \ + -DCMAKE_BUILD_TYPE=Release ../llvm || touch .failed # shellcheck disable=SC2086 $MAKE $JOBS || touch .failed $MAKE install || touch .failed + rm -f ../llvm ../clang ../clang-tools-extra ../compiler-rt + cp -a ../$CLANG_DIR/tools/scan-build/* "$DESTDIR$TARGETDIR/bin" cp -a ../$CLANG_DIR/tools/scan-view/* "$DESTDIR$TARGETDIR/bin" diff --git a/util/crossgcc/sum/clang-11.0.0.src.tar.xz.cksum b/util/crossgcc/sum/clang-11.0.0.src.tar.xz.cksum deleted file mode 100644 index 817234f50b..0000000000 --- a/util/crossgcc/sum/clang-11.0.0.src.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -02c87f5e07f2a1c1e2dbb8ce8328f0106d70b10d tarballs/clang-11.0.0.src.tar.xz diff --git a/util/crossgcc/sum/clang-12.0.0.src.tar.xz.cksum b/util/crossgcc/sum/clang-12.0.0.src.tar.xz.cksum new file mode 100644 index 0000000000..42be5d9f3d --- /dev/null +++ b/util/crossgcc/sum/clang-12.0.0.src.tar.xz.cksum @@ -0,0 +1 @@ +51250856f368acef5ab335a16f994bf29ad3d115 tarballs/clang-12.0.0.src.tar.xz diff --git a/util/crossgcc/sum/clang-tools-extra-11.0.0.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-11.0.0.src.tar.xz.cksum deleted file mode 100644 index f6b260faa3..0000000000 --- a/util/crossgcc/sum/clang-tools-extra-11.0.0.src.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -b77dc0494894b997c8f4012debbf0bf469462386 tarballs/clang-tools-extra-11.0.0.src.tar.xz diff --git a/util/crossgcc/sum/clang-tools-extra-12.0.0.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-12.0.0.src.tar.xz.cksum new file mode 100644 index 0000000000..63285948e2 --- /dev/null +++ b/util/crossgcc/sum/clang-tools-extra-12.0.0.src.tar.xz.cksum @@ -0,0 +1 @@ +5fe54db45be35b8f77acc32f08e01912f8e8b915 tarballs/clang-tools-extra-12.0.0.src.tar.xz diff --git a/util/crossgcc/sum/cmake-3.18.1.tar.gz.cksum b/util/crossgcc/sum/cmake-3.18.1.tar.gz.cksum deleted file mode 100644 index c4f3ed29d3..0000000000 --- a/util/crossgcc/sum/cmake-3.18.1.tar.gz.cksum +++ /dev/null @@ -1 +0,0 @@ -60c36386d0df016adc96c8bb3215d02de3777869 tarballs/cmake-3.18.1.tar.gz diff --git a/util/crossgcc/sum/cmake-3.20.3.tar.gz.cksum b/util/crossgcc/sum/cmake-3.20.3.tar.gz.cksum new file mode 100644 index 0000000000..2ac43e857d --- /dev/null +++ b/util/crossgcc/sum/cmake-3.20.3.tar.gz.cksum @@ -0,0 +1 @@ +96e498c4d1ac238b6852b1113102bf2301bb88d8 tarballs/cmake-3.20.3.tar.gz diff --git a/util/crossgcc/sum/compiler-rt-11.0.0.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-11.0.0.src.tar.xz.cksum deleted file mode 100644 index fe447bf748..0000000000 --- a/util/crossgcc/sum/compiler-rt-11.0.0.src.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -be3e79fb93cd99135643a191f27c49449bf9c0ee tarballs/compiler-rt-11.0.0.src.tar.xz diff --git a/util/crossgcc/sum/compiler-rt-12.0.0.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-12.0.0.src.tar.xz.cksum new file mode 100644 index 0000000000..650f8e5356 --- /dev/null +++ b/util/crossgcc/sum/compiler-rt-12.0.0.src.tar.xz.cksum @@ -0,0 +1 @@ +7b02a455fbc6fe395da8d5411072acc04d669d94 tarballs/compiler-rt-12.0.0.src.tar.xz diff --git a/util/crossgcc/sum/llvm-11.0.0.src.tar.xz.cksum b/util/crossgcc/sum/llvm-11.0.0.src.tar.xz.cksum deleted file mode 100644 index c95d6a5d5d..0000000000 --- a/util/crossgcc/sum/llvm-11.0.0.src.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -5723ae20d1e6e9ccfda208cb9a8cf2f87c3a6107 tarballs/llvm-11.0.0.src.tar.xz diff --git a/util/crossgcc/sum/llvm-12.0.0.src.tar.xz.cksum b/util/crossgcc/sum/llvm-12.0.0.src.tar.xz.cksum new file mode 100644 index 0000000000..e4f3aa3893 --- /dev/null +++ b/util/crossgcc/sum/llvm-12.0.0.src.tar.xz.cksum @@ -0,0 +1 @@ +dbc1cf6aa2dbdeccd7ad26c9215b56963a5686d3 tarballs/llvm-12.0.0.src.tar.xz |