Changeset 75629 in vbox

Timestamp:

Nov 20, 2018 6:55:33 PM (6 years ago)

Author:

vboxsync

Message:

Config.kmk: Attempt to correct r126801 - it is not okay to invent tool properties like DTRACE_ENV_SETUP when you're not the tool, always prefix VBOX specific variables/properties! Generally, variables are more expensive than conditionals, especially when you've got the conditional anyway. Thus the if/else/endif fix is preferred.

File:

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

trunk/Config.kmk

@@ -2277 +2277 @@
  endif
  ifdef VBOX_WITH_NEW_XCODE
-  # 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"
+  if $(KBUILD_HOST_VERSION_MAJOR) >= 18 # HACK ALERT! dtrace doesn't work on Mojave if we specify our Xcode 6.2 environment.
+   override TOOL_StandardDTrace_DTRACE := dtrace "-xcpppath=$(VBOX_PATH_MACOSX_DEVEL_ROOT)/usr/bin/gcc"
+  else
+   override TOOL_StandardDTrace_DTRACE := $(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP) dtrace "-xcpppath=$(VBOX_PATH_MACOSX_DEVEL_ROOT)/usr/bin/gcc"
+  endif
   export PATH:=$(VBOX_PATH_MACOSX_SDK)/usr/bin:$(PATH)
  else