Changeset 84899 in vbox

Timestamp:

Jun 22, 2020 1:29:30 PM (5 years ago)

Author:

vboxsync

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

138768

Message:

/Config.kmk: Preparations for newer Xcode. libiconv tweak to avoid using libiconv from macports.

File:

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

trunk/Config.kmk

@@ -2716 +2716 @@
  VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \
     $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
+ ifeq ($(KBUILD_TARGET), darwin)
+  VBOX_CLANG_VERSION = $(shell $(1) --version | \
+    $(SED_EXT) -n 's|.*version \([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|p' )
+ endif
 endif
 
@@ -2848 +2852 @@
         $(QUIET)$(APPEND) '$@' '#       VBOX_PATH_MACOSX_SDK_ROOT: $(VBOX_PATH_MACOSX_SDK_ROOT)'
         $(QUIET)$(APPEND) '$@' '#     VBOX_PATH_MACOSX_DEVEL_ROOT: $(VBOX_PATH_MACOSX_DEVEL_ROOT)'
+        $(QUIET)$(APPEND) '$@' 'VBOX_CLANG_VERSION_CC          ?= $(call VBOX_CLANG_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC))'
+        $(QUIET)$(APPEND) '$@' 'VBOX_CLANG_VERSION_CXX         ?= $(call VBOX_CLANG_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CXX))'
 endif
 # HC compiler switch detection.
@@ -2933 +2939 @@
         $(QUIET)$(APPEND) '$@' ' else ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40600),)'
         $(QUIET)$(APPEND) '$@' '  VBOX_GCC_std ?= -std=c++0x'
+# darwin Xcode 5 allegedly knows what C++11 is
+ifeq ($(KBUILD_HOST),darwin)
+        $(QUIET)$(APPEND) '$@' ' else ifneq ($$(int-ge $$(VBOX_CLANG_VERSION_CXX),50000),)'
+        $(QUIET)$(APPEND) '$@' '  VBOX_GCC_std ?= -std=c++11'
+endif
         $(QUIET)$(APPEND) '$@' ' endif'
         $(QUIET)$(APPEND) '$@' 'endif'
@@ -5319 +5330 @@
 TEMPLATE_VBOXR3EXE_TOOL                = $(VBOX_GCC_TOOL)
 TEMPLATE_VBOXR3EXE_LIBS                =
+TEMPLATE_VBOXR3EXE_DEFS               += LIBICONV_PLUG # Avoid 3rd party libiconv (from macports).
 TEMPLATE_VBOXR3EXE_DEFS.darwin         = $(VBOX_DARWIN_DEF_SDK_DEFS)
 TEMPLATE_VBOXR3EXE_CFLAGS.darwin       = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -fno-common