From 09f389f52cee5e89f6eeec3c2ae1f93916cde9f1 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <nick.desaulniers@gmail.com>
Date: Wed, 6 Mar 2019 00:41:29 -0800
Subject: [PATCH 1/4] enable llvm-ar by default

---
 driver.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/driver.sh b/driver.sh
index 626251b..005d8b6 100755
--- a/driver.sh
+++ b/driver.sh
@@ -145,6 +145,8 @@ check_dependencies() {
   command -v timeout
   command -v unbuffer
   command -v clang-9
+  command -v lld
+  command -v llvm-ar
   command -v "${LD:="${CROSS_COMPILE:-}"ld}"
 }
 
@@ -154,7 +156,7 @@ mako_reactor() {
   KBUILD_BUILD_TIMESTAMP="Thu Jan  1 00:00:00 UTC 1970" \
   KBUILD_BUILD_USER=driver \
   KBUILD_BUILD_HOST=clangbuiltlinux \
-  make -j"${jobs:-$(nproc)}" CC="${CC}" HOSTCC="${CC}" LD="${LD}" HOSTLD="${HOSTLD:-ld}" "${@}"
+  make -j"${jobs:-$(nproc)}" CC="${CC}" HOSTCC="${CC}" LD="${LD}" HOSTLD="${HOSTLD:-ld}" AR="llvm-ar" "${@}"
 }
 
 build_linux() {

From db54c60699957d3c47d9d72edd5b1dc218517ad1 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Wed, 6 Mar 2019 10:48:21 -0800
Subject: [PATCH 2/4] add -9 suffixes

---
 driver.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/driver.sh b/driver.sh
index 005d8b6..d212337 100755
--- a/driver.sh
+++ b/driver.sh
@@ -145,8 +145,8 @@ check_dependencies() {
   command -v timeout
   command -v unbuffer
   command -v clang-9
-  command -v lld
-  command -v llvm-ar
+  command -v lld-9
+  command -v llvm-ar-9
   command -v "${LD:="${CROSS_COMPILE:-}"ld}"
 }
 

From e959deb862bda381d9ef3d904e47059c43d016a7 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Wed, 6 Mar 2019 10:58:08 -0800
Subject: [PATCH 3/4] add missed -9

---
 driver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/driver.sh b/driver.sh
index d212337..b99c478 100755
--- a/driver.sh
+++ b/driver.sh
@@ -156,7 +156,7 @@ mako_reactor() {
   KBUILD_BUILD_TIMESTAMP="Thu Jan  1 00:00:00 UTC 1970" \
   KBUILD_BUILD_USER=driver \
   KBUILD_BUILD_HOST=clangbuiltlinux \
-  make -j"${jobs:-$(nproc)}" CC="${CC}" HOSTCC="${CC}" LD="${LD}" HOSTLD="${HOSTLD:-ld}" AR="llvm-ar" "${@}"
+  make -j"${jobs:-$(nproc)}" CC="${CC}" HOSTCC="${CC}" LD="${LD}" HOSTLD="${HOSTLD:-ld}" AR="llvm-ar-9" "${@}"
 }
 
 build_linux() {

From 4a877ae0fa743ff66d0cc89628c2608d27a63813 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Wed, 6 Mar 2019 13:30:38 -0800
Subject: [PATCH 4/4] remove lld-9 check

---
 driver.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/driver.sh b/driver.sh
index b99c478..2531881 100755
--- a/driver.sh
+++ b/driver.sh
@@ -145,7 +145,6 @@ check_dependencies() {
   command -v timeout
   command -v unbuffer
   command -v clang-9
-  command -v lld-9
   command -v llvm-ar-9
   command -v "${LD:="${CROSS_COMPILE:-}"ld}"
 }