diff options
Diffstat (limited to 'util/crossgcc/buildgcc')
| -rwxr-xr-x | util/crossgcc/buildgcc | 20 |
1 files changed, 11 insertions, 9 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" |