Changeset 39196 in vbox

Timestamp:

Nov 4, 2011 9:55:07 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74699

Message:

Config.kmk: There is only the llvm flavor gcc in Xcode 4.2.

File:

• trunk/Config.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -1789 +1789 @@
     VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
     VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
-    VBOX_MACOSX_GCC_INFIX ?= -4.2
+    if $(VBOX_XCODE_VERSION_MINOR) >= 2
+     TOOL_GXX4MACHO_PREFIX ?= llvm-
+     TOOL_GXX4MACHO_SUFFIX ?= -4.2
+    else
+     TOOL_GXX4MACHO_SUFFIX ?= -4.2
+    endif
    else
     VBOX_DEF_MACOSX_VERSION_MIN ?= 10.5
     VBOX_DARWIN_NO_COMPACT_LINKEDIT ?= $(VBOX_LD_no_compact_linkedit)
-    VBOX_MACOSX_GCC_INFIX ?= -4.0
+    TOOL_GXX4MACHO_SUFFIX ?= -4.0
    endif
   else
@@ -1801 +1806 @@
    VBOX_DEF_MACOSX_VERSION_MIN ?= 10.4
    VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
-   VBOX_MACOSX_GCC_INFIX ?= -4.0
+   TOOL_GXX4MACHO_SUFFIX ?= -4.0
   endif
  else
@@ -1808 +1813 @@
   endif
   VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
-  VBOX_MACOSX_GCC_INFIX ?= -4.2
+  TOOL_GXX4MACHO_SUFFIX ?= -4.2
+  if $(VBOX_XCODE_VERSION_MINOR) >= 2
+   TOOL_GXX4MACHO_PREFIX ?= llvm-
+  endif
   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_SUFFIX ?= $(TOOL_GXX4MACHO_SUFFIX)$(HOSTSUFF_EXE)
+ TOOL_GCC4MACHO_PREFIX ?= $(TOOL_GXX4MACHO_PREFIX)
+ ## @todo WTF do we do the -m32/64 stuff here for these compilers? Also the visibility should be elsewhere...
+ TOOL_GXX4MACHO_OBJC   = $(TOOL_GCC4MACHO_PREFIX)gcc$(TOOL_GCC4MACHO_SUFFIX) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden
+ TOOL_GXX4MACHO_OBJCXX = $(TOOL_GCC4MACHO_PREFIX)gcc$(TOOL_GCC4MACHO_SUFFIX) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden -fvisibility-inlines-hidden
  ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.4)
   ifeq ($(origin VBOX_DARWIN_CLASSIC_LINKER),undefined)
@@ -4988 +4989 @@
 quick:
         $(MAKE) VBOX_QUICK=1
+
+