Changeset 54002 in vbox for trunk/src/VBox

Timestamp:

Jan 28, 2015 12:31:38 AM (10 years ago)

Author:

vboxsync

Message:

mostly disabled the VBoxDTrace extpack on solaris (not needed there anyway).

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

@@ -95 +95 @@
  # The ring-3 VBoxDTrace command implementation (library).
  #
- DLLS += VBoxDTraceCmd
+ ifneq ($(KBUILD_TARGET),solaris) # disabled on solaris - neiter needed nor currently able to build it here.
+  DLLS += VBoxDTraceCmd
+ endif
  VBoxDTraceCmd_TEMPLATE = VBoxR3ExtPackDTrace
  VBoxDTraceCmd_DEFS = RTMEM_WRAP_TO_EF_APIS
@@ -226 +228 @@
  # The ring-0 part of VBoxDTrace.
  #
- SYSMODS += VBoxDTraceR0
+ ifneq ($(KBUILD_TARGET),solaris) # disabled on solaris - neiter needed nor currently able to build it here.
+  SYSMODS += VBoxDTraceR0
+ endif
  VBoxDTraceR0_TEMPLATE = VBoxR0ExtPackDTrace
  VBoxDTraceR0_DEFS = IN_VBOXDTRACE_R0 IN_RT_R0
@@ -263 +267 @@
  VBOX_VBOXDTRACE_FILES_MACRO = \
         $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)/$(1)/VBoxDTraceMain.$(3)=>$(1)/VBoxDTraceMain.$(3) \
-        $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)/$(1)/VBoxDTraceCmd.$(3)=>$(1)/VBoxDTraceCmd.$(3) \
-        $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)/$(1)/VBoxDTraceR0.r0=>$(1)/VBoxDTraceR0.r0
+       $(if $(intersects $1, solaris.x86 solaris.amd64 \
+        ,$(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)/$(1)/VBoxDTraceCmd.$(3)=>$(1)/VBoxDTraceCmd.$(3) \
+         $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)/$(1)/VBoxDTraceR0.r0=>$(1)/VBoxDTraceR0.r0 \
+       )
 
  VBOX_VBOXDTRACE_FILES := \