From f862f91c1cf336b8c3065638c1842b9cd8f6d242 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Thu, 19 Dec 2019 22:18:22 +0200
Subject: [PATCH] Allow overriding default llvm and msvcrt versions.

build-mingw-w64.sh already provides --with-default-msvcrt option, but
this makes it more convenient to use build-all.sh with non-default
msvcrt config.
---
 build-llvm.sh      | 3 ++-
 build-mingw-w64.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build-llvm.sh b/build-llvm.sh
index b30d845..677169f 100755
--- a/build-llvm.sh
+++ b/build-llvm.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+: ${LLVM_VERSION:=llvmorg-9.0.0}
 ASSERTS=OFF
 BUILDDIR=build
 unset HOST
@@ -51,7 +52,7 @@ fi
 if [ -n "$SYNC" ] || [ -n "$CHECKOUT" ]; then
     cd llvm-project
     [ -z "$SYNC" ] || git fetch
-    git checkout llvmorg-9.0.0
+    git checkout $LLVM_VERSION
     cd ..
 fi
 
diff --git a/build-mingw-w64.sh b/build-mingw-w64.sh
index b970650..148977b 100755
--- a/build-mingw-w64.sh
+++ b/build-mingw-w64.sh
@@ -3,7 +3,7 @@
 set -e
 
 DEFAULT_WIN32_WINNT=0x601
-DEFAULT_MSVCRT=ucrt
+: ${DEFAULT_MSVCRT:=ucrt}
 unset HOST
 
 while [ $# -gt 0 ]; do