VirtualBox

Ticket #9807: patch-Config.kmk.diff

File patch-Config.kmk.diff, 3.6 KB (added by royliu, 13 years ago)

The Config.kmk patch.

  • Config.kmk

    old new ifeq ($(KBUILD_TARGET),darwin)  
    17811781   if "$(VBOX_XCODE_VERSION_MAJOR)" == "4"
    17821782    VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
    17831783    VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
    1784     VBOX_MACOSX_GCC_INFIX ?= -4.2
     1784    VBOX_MACOSX_GCC_PREFIX ?= llvm-
     1785    VBOX_MACOSX_GCC_SUFFIX ?= -4.2
    17851786   else
    17861787    VBOX_DEF_MACOSX_VERSION_MIN ?= 10.5
    17871788    VBOX_DARWIN_NO_COMPACT_LINKEDIT ?= $(VBOX_LD_no_compact_linkedit)
    1788     VBOX_MACOSX_GCC_INFIX ?= -4.0
     1789    VBOX_MACOSX_GCC_PREFIX ?= llvm-
     1790    VBOX_MACOSX_GCC_SUFFIX ?= -4.0
    17891791   endif
    17901792  else
    17911793   if $(VBOX_XCODE_VERSION_MAJOR) >= 4
    ifeq ($(KBUILD_TARGET),darwin)  
    17931795   endif
    17941796   VBOX_DEF_MACOSX_VERSION_MIN ?= 10.4
    17951797   VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
    1796    VBOX_MACOSX_GCC_INFIX ?= -4.0
     1798   VBOX_MACOSX_GCC_PREFIX ?=
     1799   VBOX_MACOSX_GCC_SUFFIX ?= -4.0
    17971800  endif
    17981801 else
    17991802  if $(VBOX_XCODE_VERSION_MAJOR) < 4 && "$(VBOX_XCODE_VERSION)" != "3.2"
    18001803   $(error 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION))
    18011804  endif
    18021805  VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
    1803   VBOX_MACOSX_GCC_INFIX ?= -4.2
     1806  VBOX_MACOSX_GCC_PREFIX ?= llvm-
     1807  VBOX_MACOSX_GCC_SUFFIX ?= -4.2
    18041808  VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
    18051809 endif
    1806  TOOL_GCC4MACHO_CC  = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
    1807  TOOL_GCC4MACHO_CXX = g++$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
    1808  TOOL_GCC4MACHO_AS  = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
    1809  TOOL_GCC4MACHO_LD  = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
    1810  TOOL_GCC4MACHO_LD_SYSMOD = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
    1811  TOOL_GXX4MACHO_CC  = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
    1812  TOOL_GXX4MACHO_CXX = g++$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
    1813  TOOL_GXX4MACHO_OBJC= gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden
    1814  TOOL_GXX4MACHO_OBJCXX = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden -fvisibility-inlines-hidden
    1815  TOOL_GXX4MACHO_AS  = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
    1816  TOOL_GXX4MACHO_LD  = g++$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
    1817  TOOL_GXX4MACHO_LD_SYSMOD = g++$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
     1810 TOOL_GCC4MACHO_CC  = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
     1811 TOOL_GCC4MACHO_CXX = $(VBOX_MACOSX_GCC_PREFIX)g++$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
     1812 TOOL_GCC4MACHO_AS  = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
     1813 TOOL_GCC4MACHO_LD  = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
     1814 TOOL_GCC4MACHO_LD_SYSMOD = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
     1815 TOOL_GXX4MACHO_CC  = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
     1816 TOOL_GXX4MACHO_CXX = $(VBOX_MACOSX_GCC_PREFIX)g++$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
     1817 TOOL_GXX4MACHO_OBJC= $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden
     1818 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
     1819 TOOL_GXX4MACHO_AS  = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
     1820 TOOL_GXX4MACHO_LD  = $(VBOX_MACOSX_GCC_PREFIX)g++$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
     1821 TOOL_GXX4MACHO_LD_SYSMOD = $(VBOX_MACOSX_GCC_PREFIX)g++$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
    18181822 ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.4)
    18191823  ifeq ($(origin VBOX_DARWIN_CLASSIC_LINKER),undefined)
    18201824   VBOX_DARWIN_CLASSIC_LINKER := $(shell ld -v 2>&1 )

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy