From 3f0d9c7f9ed5af1fc2c65bd781e4b80c4f592492 Mon Sep 17 00:00:00 2001 From: William A Rowe Jr Date: Thu, 17 Dec 2020 16:31:24 -0600 Subject: [PATCH] Step 4, build only 3.7.2, lets us go live with llvm 11.0.0 - Toolchains built on our Windows docker image containing llvm 11.0.0 cannot be built for or built with any older version of bazel such as 3.6.0 - Rebased due to very confused merge. Following this build, we need to add the next target flavor of bazel, e.g. 4.0.0 as a 2nd item once again. Co-authored-by: William A Rowe Jr Co-authored-by: Sunjay Bhatia Signed-off-by: William A Rowe Jr Signed-off-by: Sunjay Bhatia --- build_container/build_container_windows.ps1 | 4 ++-- toolchains/regenerate.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_container/build_container_windows.ps1 b/build_container/build_container_windows.ps1 index bd80af56..a40d35ae 100644 --- a/build_container/build_container_windows.ps1 +++ b/build_container/build_container_windows.ps1 @@ -120,8 +120,8 @@ AddToPath C:\tools\ninja # LLVM to ensure a 64-bit build of the tool (VS BuildTools ships a 32-bit build) DownloadAndCheck $env:TEMP\LLVM-win64.exe ` - https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe ` - 893f8a12506f8ad29ca464d868fb432fdadd782786a10655b86575fc7fc1a562 + https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/LLVM-11.0.0-win64.exe ` + a773ee3519ecc8d68d91f0ec72ee939cbed8ded483ba8e10899dc19bccba1e22 RunAndCheckError $env:TEMP\LLVM-win64.exe @("/S") $true AddToPath $env:ProgramFiles\LLVM\bin diff --git a/toolchains/regenerate.sh b/toolchains/regenerate.sh index ae815ec5..a8b49f6b 100755 --- a/toolchains/regenerate.sh +++ b/toolchains/regenerate.sh @@ -38,7 +38,7 @@ esac # Bazel query is the right command so bazel won't fail itself. # Keep bazel versions here at most two: current master version, next version -for BAZEL_VERSION in "3.6.0" "3.7.2"; do +for BAZEL_VERSION in "3.7.2"; do for RBE_BAZEL_TARGET in ${RBE_BAZEL_TARGET_LIST}; do USE_BAZEL_VERSION="${BAZEL_VERSION}" bazel query ${BAZEL_QUERY_OPTIONS} ${RBE_BAZEL_TARGET} done