VirtualBox

Changeset 60959 in vbox for trunk


Ignore:
Timestamp:
May 12, 2016 3:09:25 PM (9 years ago)
Author:
vboxsync
Message:

Config.kmk: Adjustments for newer Xcode.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r60861 r60959  
    562562VBOX_WITH_MAIN_USB_ID_DATABASE = 1
    563563# The recompiler.
    564 VBOX_WITH_REM = 1
     564if !defined(VBOX_WITH_NEW_XCODE) || "$(KBUILD_TARGET)" != "darwin"
     565 VBOX_WITH_REM = 1
     566endif
    565567# Set this to prefix all C symbols in XPCOM, to avoid dynamic linking problems
    566568# caused by our XPCOM library polluting the symbol namespace for system libs.
     
    15411543# Compiler optimization flags.
    15421544#
    1543 VBOX_GCC_WARN     ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_Wno-unused-parameter) $(VBOX_GCC_Wlogical-op)
     1545VBOX_GCC_WARN     ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs \
     1546        $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_Wno-unused-parameter) $(VBOX_GCC_Wno-language-extension-token) \
     1547        $(VBOX_GCC_Wno-extended-offsetof) $(VBOX_GCC_Wno-gnu-folding-constant) $(VBOX_GCC_Wlogical-op) \
     1548        $(VBOX_GCC_Wno-string-plus-int) $(VBOX_GCC_Wno-nested-anon-types)
    15441549VBOX_GCC_WARN_PEDANTIC = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long
    15451550ifdef VBOX_WITH_MASOCHISTIC_WARNINGS
    15461551 VBOX_GCC_WARN_PEDANTIC += -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter
    15471552endif
    1548 VBOX_GCC_PEDANTIC_CXX ?= -pedantic -Wshadow $(VBOX_GCC_WARN_PEDANTIC) -Wno-long-long $(VBOX_GCC_Wno-delete-non-virtual-dtor)
     1553VBOX_GCC_PEDANTIC_CXX ?= -pedantic -Wshadow $(VBOX_GCC_WARN_PEDANTIC) -Wno-long-long $(VBOX_GCC_Wno-delete-non-virtual-dtor) $(VBOX_GCC_Wno-return-type-c-linkage)
    15491554VBOX_GCC_PEDANTIC_C   ?= -pedantic -Wshadow $(VBOX_GCC_WARN_PEDANTIC) -Wno-long-long -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Werror-implicit-function-declaration
    15501555ifeq ($(KBUILD_TARGET),win)
     
    20282033#
    20292034ifeq ($(KBUILD_TARGET),darwin)
    2030  VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
    2031 
    2032  # Check for the Xcode 4.1 bits in tools/darwin.x86.
    2033  if   !defined(VBOX_WITH_MACOSX_COMPILERS_FROM_DEVEL) \
    2034    && !defined(VBOX_XCODE_VERSION) \
    2035    && exists "$(KBUILD_DEVTOOLS)/darwin.x86/xcode/v4.1"
    2036   VBOX_WITH_MACOSX_COMPILERS_FROM_DEVEL := 1
    2037   VBOX_PATH_MACOSX_DEVEL_ROOT := $(KBUILD_DEVTOOLS)/darwin.x86/xcode/v4.1
    2038   VBOX_XCODE_VERSION := 4.1
     2035 ifdef VBOX_WITH_NEW_XCODE
     2036  VBOX_DEF_MACOSX_VERSION_MIN ?= 10.9
     2037 else
     2038  VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
     2039 endif
     2040
     2041 ifdef VBOX_WITH_NEW_XCODE
     2042  # Check for the Xcode 6.2 bits in tools/darwin.amd64.
     2043  if   !defined(VBOX_WITH_MACOSX_COMPILERS_FROM_DEVEL) \
     2044    && !defined(VBOX_XCODE_VERSION) \
     2045    && exists "$(KBUILD_DEVTOOLS)/darwin.amd64/xcode/v6.2"
     2046   VBOX_WITH_MACOSX_COMPILERS_FROM_DEVEL := 1
     2047   VBOX_PATH_MACOSX_DEVEL_ROOT := $(KBUILD_DEVTOOLS)/darwin.amd64/xcode/v6.2/x.app/Contents/Developer
     2048   VBOX_XCODE_VERSION := 6.2
     2049  endif
     2050 else
     2051  # Check for the Xcode 4.1 bits in tools/darwin.x86.
     2052  if   !defined(VBOX_WITH_MACOSX_COMPILERS_FROM_DEVEL) \
     2053    && !defined(VBOX_XCODE_VERSION) \
     2054    && exists "$(KBUILD_DEVTOOLS)/darwin.x86/xcode/v4.1"
     2055   VBOX_WITH_MACOSX_COMPILERS_FROM_DEVEL := 1
     2056   VBOX_PATH_MACOSX_DEVEL_ROOT := $(KBUILD_DEVTOOLS)/darwin.x86/xcode/v4.1
     2057   VBOX_XCODE_VERSION := 4.1
     2058  endif
    20392059 endif
    20402060
    20412061 # Fallback - system / LocalConfig.kmk.
    2042  VBOX_PATH_MACOSX_DEVEL_ROOT ?= /Developer
    2043  VBOX_PATH_MACOSX_SDK_ROOT ?= $(VBOX_PATH_MACOSX_DEVEL_ROOT)/SDKs
     2062 ifdef VBOX_WITH_NEW_XCODE
     2063  ifndef VBOX_PATH_MACOSX_DEVEL_ROOT
     2064   VBOX_PATH_MACOSX_DEVEL_ROOT := $(firstword $(wildcard /Applications/Xcode.app/Contents/Developer /Developer))
     2065  endif
     2066  ifndef VBOX_PATH_MACOSX_SDK_ROOT
     2067   VBOX_PATH_MACOSX_SDK_ROOT := $(firstword $(wildcard \
     2068                 $(VBOX_PATH_MACOSX_DEVEL_ROOT)/Platforms/MacOSX.platform/Developer/SDKs/. \
     2069                 $(VBOX_PATH_MACOSX_DEVEL_ROOT)/SDKs/. \
     2070                 /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/. \
     2071                 /Developer/SDKs/. ))
     2072  endif
     2073  ifndef VBOX_PATH_MACOSX_TOOLCHAIN_ROOT
     2074   VBOX_PATH_MACOSX_TOOLCHAIN_ROOT := $(firstword $(wildcard \
     2075                $(VBOX_PATH_MACOSX_DEVEL_ROOT)/Library/Developer/CommandLineTools/. \
     2076                $(VBOX_PATH_MACOSX_DEVEL_ROOT)/Toolchains/XcodeDefault.xctoolchain/. \
     2077                /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/. \
     2078               /Library/Developer/CommandLineTools/. \
     2079                ) /. )
     2080  endif
     2081 else
     2082  VBOX_PATH_MACOSX_DEVEL_ROOT     ?= /Developer
     2083  VBOX_PATH_MACOSX_SDK_ROOT       ?= $(VBOX_PATH_MACOSX_DEVEL_ROOT)/SDKs
     2084  VBOX_PATH_MACOSX_TOOLCHAIN_ROOT ?= $(VBOX_PATH_MACOSX_DEVEL_ROOT)
     2085 endif
    20442086
    20452087 # Figure the default SDK location and obsolete linker tricks.
     
    20662108    VBOX_XCODE_VERSION := $(word 2, $(shell xcodebuild -version))
    20672109   endif
    2068    VBOX_XCODE_VERSION ?= 4.1
    2069   endif
    2070   ifeq ($(VBOX_XCODE_VERSION),4.2)
    2071    $(warning Xcode 4.2 is not able to correctly build the recompiler!)
    2072    $(warning Please downgrade to Xcode 4.1 if you want a working VMM!)
     2110   ifdef VBOX_WITH_NEW_XCODE
     2111    VBOX_XCODE_VERSION ?= 6.2
     2112   else
     2113    VBOX_XCODE_VERSION ?= 4.1
     2114   endif
     2115  endif
     2116  ifdef VBOX_WITH_NEW_XCODE
     2117   if defined(VBOX_WITH_REM) && "$(VBOX_XCODE_VERSION)" >= "4.2"
     2118    $(warning Xcode $(VBOX_XCODE_VERSION) is not able to correctly build the recompiler! Please disabled it: 'VBOX_WITH_REM=')
     2119   endif
     2120   ifdef KBUILD_USE_KOBJCACHE
     2121    $(warning KBUILD_USE_KOBJCACHE does _not_ currently work with this version of Xcode)
     2122   endif
     2123  else
     2124   ifeq ($(VBOX_XCODE_VERSION),4.2)
     2125    $(warning Xcode 4.2 is not able to correctly build the recompiler!)
     2126    $(warning Please downgrade to Xcode 4.1 if you want a working VMM!)
     2127   endif
    20732128  endif
    20742129 else
     
    20932148  endif
    20942149 endif
    2095  if $(VBOX_XCODE_VERSION_MAJOR) == 4 && $(VBOX_XCODE_VERSION_MINOR) >= 2
    2096   TOOL_GXX4MACHO_PREFIX ?= llvm-
    2097  endif
    2098  TOOL_GXX4MACHO_SUFFIX ?= -4.2
     2150 if  $(VBOX_XCODE_VERSION_MAJOR) >= 5
     2151  # temp hack.
     2152  TOOL_GXX4MACHO_CC        = $(TOOL_GXX4MACHO_PREFIX)clang$(TOOL_GXX4MACHO_SUFFIX)
     2153  TOOL_GXX4MACHO_CXX       = $(TOOL_GXX4MACHO_PREFIX)clang++$(TOOL_GXX4MACHO_SUFFIX)
     2154  TOOL_GXX4MACHO_OBJC      = $(TOOL_GXX4MACHO_PREFIX)clang$(TOOL_GXX4MACHO_SUFFIX)
     2155  TOOL_GXX4MACHO_OBJCXX    = $(TOOL_GXX4MACHO_PREFIX)clang$(TOOL_GXX4MACHO_SUFFIX)
     2156  TOOL_GXX4MACHO_AS        = $(TOOL_GXX4MACHO_PREFIX)clang$(TOOL_GXX4MACHO_SUFFIX)
     2157  TOOL_GXX4MACHO_LD        = $(TOOL_GXX4MACHO_PREFIX)clang++$(TOOL_GXX4MACHO_SUFFIX)
     2158  TOOL_GXX4MACHO_LD_SYSMOD = $(TOOL_GXX4MACHO_PREFIX)clang++$(TOOL_GXX4MACHO_SUFFIX)
     2159  TOOL_GXX4MACHO_PREFIX   :=
     2160  TOOL_GXX4MACHO_SUFFIX   :=
     2161 else
     2162  if  $(VBOX_XCODE_VERSION_MAJOR) > 4 || ($(VBOX_XCODE_VERSION_MAJOR) == 4 && $(VBOX_XCODE_VERSION_MINOR) >= 2)
     2163   TOOL_GXX4MACHO_PREFIX ?= llvm-
     2164  endif
     2165  if  $(VBOX_XCODE_VERSION_MAJOR) < 5
     2166   TOOL_GXX4MACHO_SUFFIX ?= -4.2
     2167  endif
     2168 endif
    20992169 VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
    21002170
     
    21022172 TOOL_GCC4MACHO_PREFIX ?= $(TOOL_GXX4MACHO_PREFIX)
    21032173 ifdef VBOX_WITH_MACOSX_COMPILERS_FROM_DEVEL
    2104   TOOL_GCC4MACHO_PREFIX := $(VBOX_PATH_MACOSX_DEVEL_ROOT)/usr/bin/$(TOOL_GCC4MACHO_PREFIX)
    2105   TOOL_GXX4MACHO_PREFIX := $(VBOX_PATH_MACOSX_DEVEL_ROOT)/usr/bin/$(TOOL_GXX4MACHO_PREFIX)
     2174  TOOL_GCC4MACHO_PREFIX := $(VBOX_PATH_MACOSX_TOOLCHAIN_ROOT)/usr/bin/$(TOOL_GCC4MACHO_PREFIX)
     2175  TOOL_GXX4MACHO_PREFIX := $(VBOX_PATH_MACOSX_TOOLCHAIN_ROOT)/usr/bin/$(TOOL_GXX4MACHO_PREFIX)
    21062176  TOOL_GCC4MACHO_SUFFIX := $(TOOL_GCC4MACHO_SUFFIX) -isysroot $(VBOX_PATH_MACOSX_SDK)
    21072177  TOOL_GXX4MACHO_SUFFIX := $(TOOL_GXX4MACHO_SUFFIX) -isysroot $(VBOX_PATH_MACOSX_SDK)
     
    21092179   SVN := $(firstword $(which svn) svn)
    21102180  endif
    2111   export PATH:=$(VBOX_PATH_MACOSX_DEVEL_ROOT)/usr/bin/:$(PATH)
     2181  if  $(VBOX_XCODE_VERSION_MAJOR) > 4 || ($(VBOX_XCODE_VERSION_MAJOR) == 4 && $(VBOX_XCODE_VERSION_MINOR) >= 2)
     2182   export PATH:=$(VBOX_PATH_MACOSX_DEVEL_ROOT)/usr/bin/:$(VBOX_PATH_MACOSX_SDK)/usr/bin:$(VBOX_PATH_MACOSX_TOOLCHAIN_ROOT)/usr/bin:$(PATH)
     2183   export DEVELOPER_DIR:=$(VBOX_PATH_MACOSX_DEVEL_ROOT)
     2184  else
     2185   export PATH:=$(VBOX_PATH_MACOSX_DEVEL_ROOT)/usr/bin/:$(PATH)
     2186  endif
    21122187  TOOL_GXX32_CC  = $(TOOL_GCC4MACHO_PREFIX)gcc$(TOOL_GCC4MACHO_SUFFIX) -m32
    21132188  TOOL_GXX32_CXX = $(TOOL_GCC4MACHO_PREFIX)g++$(TOOL_GCC4MACHO_SUFFIX) -m32
    21142189  TOOL_GXX32_LD  = $(TOOL_GXX32_CXX)
    2115   override TOOL_StandardDTrace_DTRACE := dtrace "-xcpppath=$(TOOL_GCC4MACHO_PREFIX)cpp-4.2"
    2116  endif
    2117  ## @todo WTF do we do the -m32/64 stuff here for these compilers? Also the visibility should be elsewhere...
    2118  TOOL_GXX4MACHO_OBJC   = $(TOOL_GCC4MACHO_PREFIX)gcc$(TOOL_GCC4MACHO_SUFFIX) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden
    2119  TOOL_GXX4MACHO_OBJCXX = $(TOOL_GCC4MACHO_PREFIX)gcc$(TOOL_GCC4MACHO_SUFFIX) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden -fvisibility-inlines-hidden
     2190  if  $(VBOX_XCODE_VERSION_MAJOR) >= 5
     2191   # override TOOL_StandardDTrace_DTRACE := dtrace "-xcpppath=$(TOOL_GCC4MACHO_PREFIX)cpp" - busted, pray the default /usr/bin/ stuff works!
     2192  else
     2193   override TOOL_StandardDTrace_DTRACE := dtrace "-xcpppath=$(TOOL_GCC4MACHO_PREFIX)cpp-4.2"
     2194  endif
     2195 endif
     2196 if  $(VBOX_XCODE_VERSION_MAJOR) < 5
     2197  ## @todo WTF do we do the -m32/64 stuff here for these compilers? Also the visibility should be elsewhere...
     2198  TOOL_GXX4MACHO_OBJC   = $(TOOL_GCC4MACHO_PREFIX)gcc$(TOOL_GCC4MACHO_SUFFIX) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden
     2199  TOOL_GXX4MACHO_OBJCXX = $(TOOL_GCC4MACHO_PREFIX)gcc$(TOOL_GCC4MACHO_SUFFIX) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden -fvisibility-inlines-hidden
     2200 endif
    21202201
    21212202 VBOX_DARWIN_DEF_SDK_DEFS        := MAC_OS_X_VERSION_MIN_REQUIRED=$(subst .,,$(VBOX_DEF_MACOSX_VERSION_MIN))0 \
     
    25142595        $(QUIET)$(APPEND) '$@' 'endif'
    25152596endif
    2516 # Prevent warnings about unused parameters as of gcc-4.8 as this warning is now very verbose
    2517         $(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)'
    2518         $(QUIET)$(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40800),)'
    2519         $(QUIET)$(APPEND) '$@' '  VBOX_GCC_Wno-unused-parameter ?= -Wno-unused-parameter'
    2520         $(QUIET)$(APPEND) '$@' ' endif'
    2521         $(QUIET)$(APPEND) '$@' 'endif'
     2597# Prevent warnings about unused parameters as of gcc-4.8 / clang 6 as this warning is now very verbose
     2598        $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-unused-parameter ?= $(call VBOX_GCC_CHECK_CC,-Wno-unused-parameter,)'
     2599# Clang 6.
     2600        $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-language-extension-token ?= $(call VBOX_GCC_CHECK_CC,-Wno-language-extension-token,)'
     2601        $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-extended-offsetof ?= $(call VBOX_GCC_CHECK_CC,-Wno-extended-offsetof,)'
     2602        $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-gnu-folding-constant ?= $(call VBOX_GCC_CHECK_CC,-Wno-gnu-folding-constant,)'
     2603        $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-return-type-c-linkage ?= $(call VBOX_GCC_CHECK_CXX,-Wno-return-type-c-linkage,)'
     2604        $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-string-plus-int ?= $(call VBOX_GCC_CHECK_CC,-Wno-string-plus-int,)'
     2605        $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-nested-anon-types ?= $(call VBOX_GCC_CHECK_CC,-Wno-nested-anon-types,)'
    25222606# C++ Std settings
    25232607        $(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)'
     
    38363920TEMPLATE_VBOXR0DRV_TOOL                = GXX4MACHO
    38373921TEMPLATE_VBOXR0DRV_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS) KERNEL KERNEL_PRIVATE DRIVER_PRIVATE APPLE NeXT
    3838 TEMPLATE_VBOXR0DRV_INCS               += $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/Headers
     3922 ifdef VBOX_WITH_NEW_XCODE # Note xcode uses -fstrict-aliasing, we currently don't dare... We also add -mno-red-zone.
     3923TEMPLATE_VBOXR0DRV_INCS               += \
     3924        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/PrivateHeaders \
     3925        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/Headers
     3926## @todo try use VBOX_GCC_PEDANTIC_CXX
     3927TEMPLATE_VBOXR0DRV_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -mkernel \
     3928        -g $(VBOX_GCC_pipe) $(VBOX_GCC_WARN) -Wno-long-long $(VBOX_GCC_fdiagnostics-show-option) \
     3929        -fno-common -nostdinc -fno-builtin $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
     3930        -fno-exceptions -msoft-float -fapple-kext -fno-rtti -mkernel \
     3931        -fmodules -fmodules-prune-interval=86400 -fmodules-prune-after=345600 -Wnon-modular-include-in-framework-module \
     3932        -Werror=non-modular-include-in-framework-module \
     3933        $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fasm-blocks -fno-strict-aliasing -stdlib=libc++
     3934# also used by xcode 6.2: \
     3935# -Werror=return-type \
     3936# -Werror=deprecated-objc-isa-usage \
     3937# -Werror=objc-root-class \
     3938# -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code \
     3939# -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function \
     3940# -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body \
     3941# -Wconditional-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants \
     3942# -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion \
     3943# -Wshorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions -Wdeprecated-declarations -Winvalid-offsetof -Wno-sign-conversion
     3944TEMPLATE_VBOXR0DRV_CXXFLAGS.amd64      = -m64 -mno-red-zone
     3945TEMPLATE_VBOXR0DRV_CXXFLAGS.x86        = -m32
     3946TEMPLATE_VBOXR0DRV_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -mkernel \
     3947        -g $(VBOX_GCC_pipe) $(VBOX_GCC_WARN) -Wno-long-long $(VBOX_GCC_fdiagnostics-show-option) \
     3948        -fno-common -nostdinc -fno-builtin $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
     3949        -fno-exceptions -msoft-float -fapple-kext -fno-rtti  \
     3950        -fmodules -fmodules-prune-interval=86400 -fmodules-prune-after=345600 -Wnon-modular-include-in-framework-module \
     3951        -Werror=non-modular-include-in-framework-module \
     3952        $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fasm-blocks -fno-strict-aliasing
     3953TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 -mno-red-zone
     3954TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32
     3955TEMPLATE_VBOXR0DRV_LDFLAGS             =  $(filter-out $(VBOX_DARWIN_NO_COMPACT_LINKEDIT),$(VBOX_DARWIN_DEF_SDK_LDFLAGS)) \
     3956        -nostdlib -stdlib=libc++ -Wl,-kext -Wl,-keep_private_externs
     3957TEMPLATE_VBOXR0DRV_LDFLAGS.amd64       = -m64
     3958TEMPLATE_VBOXR0DRV_LDFLAGS.x86         = -m32
     3959TEMPLATE_VBOXR0DRV_LIBS                = kmodc++ kmod cc_kext
     3960 else
     3961TEMPLATE_VBOXR0DRV_INCS               += \
     3962        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/PrivateHeaders \
     3963        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/Headers
    38393964## @todo try use VBOX_GCC_PEDANTIC_CXX
    38403965TEMPLATE_VBOXR0DRV_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) \
     
    38593984TEMPLATE_VBOXR0DRV_LDFLAGS.x86         = -m32
    38603985TEMPLATE_VBOXR0DRV_LIBS                = kmodc++ kmod cc_kext cpp_kext $(VBOX_GCC_LIBGCC)
     3986 endif
    38613987endif
    38623988
     
    53855511        -Wno-long-long -fshort-wchar -fno-strict-aliasing \
    53865512        $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) \
    5387         $(VBOX_GCC_Wno-delete-non-virtual-dtor) $(VBOX_GCC_std) $(VBOX_GCC_IPRT_FMT_CHECK)
     5513        $(VBOX_GCC_Wno-delete-non-virtual-dtor) $(VBOX_GCC_Wno-return-type-c-linkage) $(VBOX_GCC_std) $(VBOX_GCC_IPRT_FMT_CHECK)
    53885514  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.x86 = -m32
    53895515  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.amd64 = -m64
Note: See TracChangeset for help on using the changeset viewer.

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