---

yaml
---
r: 4444
b: refs/heads/master
c: 43313b5
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18ef7cc531cb44a5dfe724a3282f09a427b353d8
+refs/heads/master: 43313b5504cae1cf241219c740fda09f1e78bd5d

trunk/mk/platform.mk

@@ -139,23 +139,27 @@ endif
 
 CFG_INFO := $(info cfg: using $(CFG_C_COMPILER))
 ifeq ($(CFG_C_COMPILER),clang)
+  CC=clang
+  CXX=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) \
+  CFG_COMPILE_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) \
     $(CFG_CLANG_CFLAGS) -c -o $(1) $(2)
-  CFG_DEPEND_C = $(CFG_GCCISH_CROSS)clang++ $(CFG_GCCISH_CFLAGS) -MT "$(1)" \
+  CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \
     -MM $(2)
-  CFG_LINK_C = $(CFG_GCCISH_CROSS)clang++ $(CFG_GCCISH_LINK_FLAGS) -o $(1) \
+  CFG_LINK_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_LINK_FLAGS) -o $(1) \
     $(CFG_GCCISH_DEF_FLAG)$(3) $(2)
 else
 ifeq ($(CFG_C_COMPILER),gcc)
+  CC=gcc
+  CXX=g++
   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) \
+  CFG_COMPILE_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) \
     $(CFG_GCC_CFLAGS) -c -o $(1) $(2)
-  CFG_DEPEND_C = $(CFG_GCCISH_CROSS)g++ $(CFG_GCCISH_CFLAGS) -MT "$(1)" \
+  CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \
     -MM $(2)
-  CFG_LINK_C = $(CFG_GCCISH_CROSS)g++ $(CFG_GCCISH_LINK_FLAGS) -o $(1) \
+  CFG_LINK_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_LINK_FLAGS) -o $(1) \
                $(CFG_GCCISH_DEF_FLAG)$(3) $(2)
 else
   CFG_ERR := $(error please try on a system with gcc or clang)