Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 41339)
+++ /trunk/Config.kmk	(revision 41340)
@@ -2699,9 +2699,9 @@
 
  TEMPLATE_VBoxRc_USES               += dtrace
+ TEMPLATE_VBoxRc_DTRACE_HDR_FLAGS    = --raw-mode-context
+ TEMPLATE_VBoxRc_DTRACE_OBJ_FLAGS    = --raw-mode-context --probe-fn-name "VMMRCProbeFire"
  ifdef VBOX_WITH_DTRACE_RC
   TEMPLATE_VBoxRc_DTRACETOOL         = VBoxTpG
   TEMPLATE_VBoxRc_DEFS              += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_RC
-  TEMPLATE_VBoxRc_DTRACE_HDR_FLAGS   = --raw-mode-context
-  TEMPLATE_VBoxRc_DTRACE_OBJ_FLAGS   = --raw-mode-context --probe-fn-name "VMMRCProbeFire"
  else
   TEMPLATE_VBoxRc_DTRACETOOL         = VBoxTpG-Disabled
@@ -3216,18 +3216,18 @@
 TEMPLATE_VBOXR3EXE_DEFS                = IN_RING3 $(ARCH_BITS_DEFS)
 TEMPLATE_VBOXR3EXE_USES                = dtrace
-ifdef VBOX_WITH_DTRACE_R3
- ifdef VBOX_WITH_NATIVE_DTRACE
-  TEMPLATE_VBOXR3EXE_DTRACETOOL        = StandardDTrace
-  TEMPLATE_VBOXR3EXE_DTRACE_OBJ_FLAGS  = -C
-  TEMPLATE_VBOXR3EXE_DTRACE_HDR_FLAGS  = -C
-  TEMPLATE_VBOXR3EXE_DEFS             += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3 VBOX_WITH_NATIVE_DTRACE
- else
-  TEMPLATE_VBOXR3EXE_DTRACETOOL        = VBoxTpG
+if defined(VBOX_WITH_DTRACE_R3) && defined(VBOX_WITH_NATIVE_DTRACE)
+ TEMPLATE_VBOXR3EXE_DTRACETOOL         = StandardDTrace
+ TEMPLATE_VBOXR3EXE_DTRACE_OBJ_FLAGS   = -C
+ TEMPLATE_VBOXR3EXE_DTRACE_HDR_FLAGS   = -C
+ TEMPLATE_VBOXR3EXE_DEFS              += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3 VBOX_WITH_NATIVE_DTRACE
+else
   TEMPLATE_VBOXR3EXE_DTRACE_HDR_FLAGS  = --ring-3-context
   TEMPLATE_VBOXR3EXE_DTRACE_OBJ_FLAGS  = --ring-3-context --pic --probe-fn-imported --probe-fn-name "SUPTracerFireProbe"
+ if defined(VBOX_WITH_DTRACE_R3)
+  TEMPLATE_VBOXR3EXE_DTRACETOOL        = VBoxTpG
   TEMPLATE_VBOXR3EXE_DEFS             += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3
- endif
-else
- TEMPLATE_VBOXR3EXE_DTRACETOOL         = VBoxTpG-Disabled
+ else
+  TEMPLATE_VBOXR3EXE_DTRACETOOL        = VBoxTpG-Disabled
+ endif
 endif
 TEMPLATE_VBOXR3EXE_LIBS.kprofile       = $(LIB_KPROFILE)