From 0b920bb1cdd72ea86a1f10086ef09e5fd0c7dad7 Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Tue, 22 Feb 2011 01:08:29 +0000
Subject: [PATCH] clang - let buildsystem figure out how to invoke AR, etc.,
 for clang too.

---
 lib/clang_build.sh | 5 -----
 share/mk/sys.mk    | 5 +----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/lib/clang_build.sh b/lib/clang_build.sh
index 15939133f..f29eab065 100755
--- a/lib/clang_build.sh
+++ b/lib/clang_build.sh
@@ -2,11 +2,6 @@
 
 export CC=clang
 export COMPILER_TYPE=gnu
-export LD="i386-pc-minix3-ld"
-export AR="i386-pc-minix3-ar"
-export OBJCOPY="i386-pc-minix3-objcopy"
-export RANLIB="i386-pc-minix3-ranlib"
-export MAKEOBJDIR=obj-gnu
 export PATH=$PATH:/usr/pkg/bin:/usr/gnu_cross/bin
 export MAKEOBJDIR=obj-elf-clang
 
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 1488fb2cb..c5694e31c 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -230,10 +230,7 @@ COMPILER_TYPE=ack
 .elif !empty(CC:Mgcc)
 COMPILER_TYPE=gnu
 AR=ar
-.elif !empty(CC:Mclang)
-COMPILER_TYPE=gnu
-AR=ar
-.elif !empty(CC:Mi386-pc-minix3-gcc)
+.elif !empty(CC:Mi386-pc-minix3-gcc) || !empty(CC:Mclang)
 COMPILER_TYPE=gnu
 AR=i386-pc-minix3-ar
 LD=i386-pc-minix3-ld