diff --git a/.cirrus.yml b/.cirrus.yml
index dadf26f43ff5f..8e08bde96206b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -52,7 +52,7 @@ x86_release_task:
   configure_script:
     - mkdir Build
     - cd Build
-    - cmake ../llvm -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release  -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld" -DLLVM_ENABLE_UNWIND_TABLES=NO -DLLVM_ENABLE_LLD=ON -DLLVM_TARGETS_TO_BUILD=RISCV -DLLVM_DISTRIBUTION_COMPONENTS="clang;clangd;lld;lldb;llvm-objdump;llvm-objcopy;llvm-strip;clang-tidy;clang-format" -DCMAKE_INSTALL_PREFIX=install -DLLVM_PARALLEL_LINK_JOBS=1 -DLLVM_APPEND_VC_REV=ON -DLLVM_VC_REPOSITORY=${CIRRUS_REPO_FULL_NAME} -DLLVM_FORCE_VC_REPOSITORY=${CIRRUS_REPO_FULL_NAME}-DLLVM_VC_REVISION=${CIRRUS_CHANGE_IN_REPO} -DLLVM_CCACHE_BUILD=ON -G Ninja
+    - cmake ../llvm -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release  -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld" -DLLVM_ENABLE_UNWIND_TABLES=NO -DLLVM_ENABLE_LLD=ON -DLLVM_TARGETS_TO_BUILD=RISCV -DLLVM_DISTRIBUTION_COMPONENTS="clang;clangd;lld;llvm-objdump;llvm-objcopy;llvm-strip;clang-tidy;clang-format" -DCMAKE_INSTALL_PREFIX=install -DLLVM_PARALLEL_LINK_JOBS=1 -DLLVM_APPEND_VC_REV=ON -DLLVM_VC_REPOSITORY=${CIRRUS_REPO_FULL_NAME} -DLLVM_FORCE_VC_REPOSITORY=${CIRRUS_REPO_FULL_NAME}-DLLVM_VC_REVISION=${CIRRUS_CHANGE_IN_REPO} -DLLVM_CCACHE_BUILD=ON -G Ninja
   build_script:
     - cd Build
     - export CCACHE_REMOTE_STORAGE="http://${CIRRUS_HTTP_CACHE_HOST}/release-amd64/${CIRRUS_OS}/"
@@ -86,7 +86,7 @@ arm_release_task:
   configure_script:
     - mkdir Build
     - cd Build
-    - cmake ../llvm -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release  -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld;lldb" -DLLVM_ENABLE_UNWIND_TABLES=NO -DLLVM_ENABLE_LLD=ON -DLLVM_TARGETS_TO_BUILD=RISCV -DLLVM_DISTRIBUTION_COMPONENTS="clang;clangd;lld;lldb;llvm-objdump;llvm-objcopy;llvm-strip;clang-tidy;clang-format" -DCMAKE_INSTALL_PREFIX=install -DLLVM_PARALLEL_LINK_JOBS=1 -DLLVM_APPEND_VC_REV=ON -DLLVM_VC_REPOSITORY=${CIRRUS_REPO_FULL_NAME} -DLLVM_FORCE_VC_REPOSITORY=${CIRRUS_REPO_FULL_NAME} -DLLVM_VC_REVISION=${CIRRUS_CHANGE_IN_REPO} -DLLVM_CCACHE_BUILD=ON -G Ninja
+    - cmake ../llvm -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release  -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld;lldb" -DLLVM_ENABLE_UNWIND_TABLES=NO -DLLVM_ENABLE_LLD=ON -DLLVM_TARGETS_TO_BUILD=RISCV -DLLVM_DISTRIBUTION_COMPONENTS="clang;clangd;lld;llvm-objdump;llvm-objcopy;llvm-strip;clang-tidy;clang-format" -DCMAKE_INSTALL_PREFIX=install -DLLVM_PARALLEL_LINK_JOBS=1 -DLLVM_APPEND_VC_REV=ON -DLLVM_VC_REPOSITORY=${CIRRUS_REPO_FULL_NAME} -DLLVM_FORCE_VC_REPOSITORY=${CIRRUS_REPO_FULL_NAME} -DLLVM_VC_REVISION=${CIRRUS_CHANGE_IN_REPO} -DLLVM_CCACHE_BUILD=ON -G Ninja
   build_script:
     - cd Build
     - export CCACHE_REMOTE_STORAGE="http://${CIRRUS_HTTP_CACHE_HOST}/release/${CIRRUS_OS}/arm64/"