---

yaml
---
r: 10820
b: refs/heads/master
c: 5257a5c
h: refs/heads/master
v: v3

Author: crabtw

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 91ee6afeaedd5ec73b0af90b4673e53d1becb8a7
+refs/heads/master: 5257a5c6c3943e39768b1619013b82f602a8f156
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/configure

@@ -536,14 +536,25 @@ do
 	# Disable unused LLVM features
 	LLVM_OPTS="$LLVM_DBG_OPTS --disable-docs --disable-jit --enable-bindings=none --disable-threads --disable-pthreads"
 
-	LLVM_CXX_32="g++ -m32"
-	LLVM_CC_32="gcc -m32"
+	if [ "$CFG_C_COMPILER" = "clang" ]
+	then
+	    LLVM_CXX_32="clang++ -m32"
+	    LLVM_CC_32="clang -m32"
+
+	    LLVM_CXX_64="clang++"
+	    LLVM_CC_64="clang"
+	else
+	    LLVM_CXX_32="g++ -m32"
+	    LLVM_CC_32="gcc -m32"
+
+	    LLVM_CXX_64="g++"
+	    LLVM_CC_64="gcc"
+	fi
+
 	LLVM_CFLAGS_32="-m32"
 	LLVM_CXXFLAGS_32="-m32"
 	LLVM_LDFLAGS_32="-m32"
 
-	LLVM_CXX_64="g++"
-	LLVM_CC_64="gcc"
 	LLVM_CFLAGS_64=""
 	LLVM_CXXFLAGS_64=""
 	LLVM_LDFLAGS_64=""