Changeset 39255 in vbox

Timestamp:

Nov 9, 2011 2:57:29 PM (13 years ago)

Author:

vboxsync

Message:

take two on those linux build fixes.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/HostDrivers/Support/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -3084 +3084 @@
  TEMPLATE_VBOXR0DRV_CXXFLAGS  += -include $(PATH_ROOT)/include/VBox/SUPDrvMangling.h
 endif
+
+#
+# Template for building libraries used by ring-0 drivers.
+#
+TEMPLATE_VBoxR0DrvLib = VBox Ring 0 Driver Library
+TEMPLATE_VBoxR0DrvLib_EXTENDS = VBOXR0DRV
+TEMPLATE_VBoxR0DrvLib_INSTTYPE = stage
+TEMPLATE_VBoxR0DrvLib_INSTTYPE.linux = stage
 
 

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -156 +156 @@
 # SUPR0IdcClient - The Ring-0 IDC client driver library.
 #
-SUPR0IdcClient_TEMPLATE = VBOXR0DRV
-SUPR0IdcClient_INSTTYPE = stage
+SUPR0IdcClient_TEMPLATE = VBoxR0DrvLib
 SUPR0IdcClient_DEFS = IN_RT_R0 IN_SUP_R0 IN_SUP_STATIC
 SUPR0IdcClient_SDKS.win = W2K3DDK WINPSDKINCS

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1547 +1547 @@
 # RuntimeR0Stub - Ring-0 context startup stub for Windows and Solaris.
 #
-RuntimeR0Stub_TEMPLATE    = $(if-expr "$(KBUILD_TARGET)" == "solaris",VBOXR0DRV,VBoxR0)
+RuntimeR0Stub_TEMPLATE    = $(if-expr "$(KBUILD_TARGET)" == "solaris",VBoxR0DrvLib,VBoxR0)
 RuntimeR0Stub_SOURCES.win = \
         nt/NtProcessStartup-stub.cpp
@@ -1557 +1557 @@
 # RuntimeR0Drv - Ring-0 library for host drivers.
 #
-RuntimeR0Drv_TEMPLATE   = VBOXR0DRV
-RuntimeR0Drv_INSTTYPE   = stage
+RuntimeR0Drv_TEMPLATE   = VBoxR0DrvLib
 RuntimeR0Drv_SDKS.win   = $(VBOX_WINDDK) WINPSDKINCS
 RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS RT_NO_EXPORT_SYMBOL