From 65e223ff9be636962d20c24a0e1198e4c559a2bb Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 8 Dec 2019 15:15:07 +0100
Subject: [PATCH] bootstrap: Default to mesar for mescc build.

* configure.sh: Default to mesar for mescc build.
---
 configure.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.sh b/configure.sh
index d3dd9e21..b0e15a5e 100755
--- a/configure.sh
+++ b/configure.sh
@@ -58,7 +58,6 @@ prefix=${prefix-/usr/local}
 mes_libc=${mes_libc-mes}
 courageous=${courageous-false}
 
-AR=${AR-$(command -v ar)} || true
 BASH=${BASH-$(command -v bash)}
 BLOOD_ELF=${BLOOD_ELF-$(command -v blood-elf)}
 CC=${CC-$(command -v gcc)} || true
@@ -213,14 +212,17 @@ case "$mes_cpu" in
         mes_bits=32;;
 esac
 #
-if $CC --version | grep gcc; then #2>/dev/null; then
+if $CC --version | grep gcc; then
     compiler=gcc
-elif $CC --version | grep tcc; then #2>/dev/null; then
+elif $CC --version | grep tcc; then
     compiler=gcc
 else
     compiler=mescc
+    AR=${AR-$PWD/scripts/mesar}
 fi
 
+AR=${AR-$(command -v ar)} || true
+
 mes_system=$mes_cpu-$mes_kernel-mes
 
 mkdir -p scripts