---

yaml
---
r: 4427
b: refs/heads/master
c: ad92595
h: refs/heads/master
i:
  4425: e1fd5de
  4423: 740af79
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 684df97ef00116ad2fb763e43508673776e992de
+refs/heads/master: ad925955d889c791b81b00e5a0f1516dceb8684a

trunk/configure

@@ -287,12 +287,17 @@ then
     case $CFG_CLANG_VERSION in
         (3.0svn | 3.0)
         step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
+        CFG_C_COMPILER="clang"
         ;;
         (*)
-        err "bad CLANG version: $CFG_CLANG_VERSION, need >=3.0svn"
+        msg "bad CLANG version: $CFG_CLANG_VERSION, need >=3.0svn; disabling"
+        CFG_C_COMPILER="gcc"
         ;;
     esac
+else
+    CFG_C_COMPILER="gcc"
 fi
+putvar CFG_C_COMPILER
 
 putvar CFG_LLVM_ROOT
 putvar CFG_LLVM_INCDIR

trunk/mk/platform.mk

@@ -135,8 +135,8 @@ ifdef CFG_WINDOWSY
 endif
 
 
-ifdef CFG_CLANG
-  CFG_INFO := $(info cfg: using clang)
+CFG_INFO := $(info cfg: using $(CFG_C_COMPILER))
+ifeq ($(CFG_C_COMPILER),clang)
   CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -fno-exceptions -g
   CFG_GCCISH_LINK_FLAGS += -g
   CFG_COMPILE_C = $(CFG_GCCISH_CROSS)clang++ $(CFG_GCCISH_CFLAGS) \
@@ -146,8 +146,7 @@ ifdef CFG_CLANG
   CFG_LINK_C = $(CFG_GCCISH_CROSS)clang++ $(CFG_GCCISH_LINK_FLAGS) -o $(1) \
     $(CFG_GCCISH_DEF_FLAG)$(3) $(2)
 else
-ifdef CFG_GCC
-  CFG_INFO := $(info cfg: using gcc)
+ifeq ($(CFG_C_COMPILER),gcc)
   CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -fno-exceptions -g
   CFG_GCCISH_LINK_FLAGS += -g
   CFG_COMPILE_C = $(CFG_GCCISH_CROSS)g++ $(CFG_GCCISH_CFLAGS) \