Changeset 75624 in vbox

Timestamp:

Nov 20, 2018 4:38:51 PM (6 years ago)

Author:

vboxsync

Message:

Config.kmk: Build fix for DTrace on MacOS Mojave.

File:

• trunk/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2277 +2277 @@
  endif
  ifdef VBOX_WITH_NEW_XCODE
-   override TOOL_StandardDTrace_DTRACE := $(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP) dtrace "-xcpppath=$(VBOX_PATH_MACOSX_DEVEL_ROOT)/usr/bin/gcc"
-   export PATH:=$(VBOX_PATH_MACOSX_SDK)/usr/bin:$(PATH)
+  # For MacOS Mojave (and probably newer) we need a more recent XCode from the system.
+  # So just drop the tool environment and use the system's XCode instead.
+  TOOL_StandardDTrace_DTRACE_ENV_SETUP:=
+  if $(KBUILD_HOST_VERSION_MAJOR) < 18 # (OS X 10.14 Mojave)
+   TOOL_StandardDTrace_DTRACE_ENV_SETUP=$(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP)
+  endif
+  override TOOL_StandardDTrace_DTRACE := dtrace $(TOOL_StandardDTrace_DTRACE_ENV_SETUP) "-xcpppath=$(VBOX_PATH_MACOSX_DEVEL_ROOT)/usr/bin/gcc"
+  export PATH:=$(VBOX_PATH_MACOSX_SDK)/usr/bin:$(PATH)
  else
   if  $(VBOX_XCODE_VERSION_MAJOR) > 4 || ($(VBOX_XCODE_VERSION_MAJOR) == 4 && $(VBOX_XCODE_VERSION_MINOR) >= 2)