--- Config.kmk.orig	2011-08-15 19:38:16.000000000 -0500
+++ Config.kmk	2011-08-15 19:38:16.000000000 -0500
@@ -1781,11 +1781,13 @@ ifeq ($(KBUILD_TARGET),darwin)
    if "$(VBOX_XCODE_VERSION_MAJOR)" == "4"
     VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
     VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
-    VBOX_MACOSX_GCC_INFIX ?= -4.2
+    VBOX_MACOSX_GCC_PREFIX ?= llvm-
+    VBOX_MACOSX_GCC_SUFFIX ?= -4.2
    else
     VBOX_DEF_MACOSX_VERSION_MIN ?= 10.5
     VBOX_DARWIN_NO_COMPACT_LINKEDIT ?= $(VBOX_LD_no_compact_linkedit)
-    VBOX_MACOSX_GCC_INFIX ?= -4.0
+    VBOX_MACOSX_GCC_PREFIX ?= llvm-
+    VBOX_MACOSX_GCC_SUFFIX ?= -4.0
    endif
   else
    if $(VBOX_XCODE_VERSION_MAJOR) >= 4
@@ -1793,28 +1795,30 @@ ifeq ($(KBUILD_TARGET),darwin)
    endif
    VBOX_DEF_MACOSX_VERSION_MIN ?= 10.4
    VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
-   VBOX_MACOSX_GCC_INFIX ?= -4.0
+   VBOX_MACOSX_GCC_PREFIX ?=
+   VBOX_MACOSX_GCC_SUFFIX ?= -4.0
   endif
  else
   if $(VBOX_XCODE_VERSION_MAJOR) < 4 && "$(VBOX_XCODE_VERSION)" != "3.2"
    $(error 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION))
   endif
   VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
-  VBOX_MACOSX_GCC_INFIX ?= -4.2
+  VBOX_MACOSX_GCC_PREFIX ?= llvm-
+  VBOX_MACOSX_GCC_SUFFIX ?= -4.2
   VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
  endif
- TOOL_GCC4MACHO_CC  = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
- TOOL_GCC4MACHO_CXX = g++$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
- TOOL_GCC4MACHO_AS  = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
- TOOL_GCC4MACHO_LD  = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
- TOOL_GCC4MACHO_LD_SYSMOD = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
- TOOL_GXX4MACHO_CC  = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
- TOOL_GXX4MACHO_CXX = g++$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
- TOOL_GXX4MACHO_OBJC= gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden
- TOOL_GXX4MACHO_OBJCXX = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden -fvisibility-inlines-hidden
- TOOL_GXX4MACHO_AS  = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
- TOOL_GXX4MACHO_LD  = g++$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
- TOOL_GXX4MACHO_LD_SYSMOD = g++$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
+ TOOL_GCC4MACHO_CC  = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
+ TOOL_GCC4MACHO_CXX = $(VBOX_MACOSX_GCC_PREFIX)g++$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
+ TOOL_GCC4MACHO_AS  = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
+ TOOL_GCC4MACHO_LD  = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
+ TOOL_GCC4MACHO_LD_SYSMOD = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
+ TOOL_GXX4MACHO_CC  = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
+ TOOL_GXX4MACHO_CXX = $(VBOX_MACOSX_GCC_PREFIX)g++$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
+ TOOL_GXX4MACHO_OBJC= $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden
+ TOOL_GXX4MACHO_OBJCXX = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden -fvisibility-inlines-hidden
+ TOOL_GXX4MACHO_AS  = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
+ TOOL_GXX4MACHO_LD  = $(VBOX_MACOSX_GCC_PREFIX)g++$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
+ TOOL_GXX4MACHO_LD_SYSMOD = $(VBOX_MACOSX_GCC_PREFIX)g++$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
  ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.4)
   ifeq ($(origin VBOX_DARWIN_CLASSIC_LINKER),undefined)
    VBOX_DARWIN_CLASSIC_LINKER := $(shell ld -v 2>&1 )