Changeset 98152 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jan 20, 2023 9:20:30 AM (23 months ago)

Author:

vboxsync

Message:

/Config.kmk,SUP/Makefile.kmk: s/VBOXR3STATIC/VBoxR3StaticBase/ (for now), switched VBoxSupLib (hardening related DLL) to use stack-probe-vcc.asm instead of chkstk.obj from the VCC lib dir. bugref:10348 bugref:10261

File:

• trunk/src/VBox/HostDrivers/Support/Makefile.kmk (modified) (1 diff)

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

@@ -555 +555 @@
 VBoxSupLib_SOURCES = \
         $(KBUILD_TARGET)/VBoxSupLib-$(KBUILD_TARGET).cpp
+VBoxSupLib_SOURCES.win.amd64 = \
+       $(VBOX_PATH_RUNTIME_SRC)/common/compiler/vcc/stack-probe-vcc.asm
+VBoxSupLib_SOURCES.win.x86 = \
+       $(VBOX_PATH_RUNTIME_SRC)/common/compiler/vcc/stack-probe-vcc.asm
 VBoxSupLib_SOURCES.win = \
         win/VBoxSupLib.rc
-VBoxSupLib_LIBS.win.x86 = \
-        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.x86)_LIB)/chkstk.obj
-VBoxSupLib_LIBS.win.amd64 = \
-        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/chkstk.obj
-ifdef VBOX_WITH_HARDENING # for /guard:cf stuff
- VBoxSupLib_LIBS.win.x86 = \
-        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.x86)_LIB)/libcmt.lib
- VBoxSupLib_LIBS.win.amd64 = \
-        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcmt.lib
+ifndef VBOX_WITH_NOCRT_STATIC
+ ifdef VBOX_WITH_HARDENING # for /guard:cf stuff
+  VBoxSupLib_LIBS.win.x86 = \
+        $(PATH_TOOL_$(TEMPLATE_VBoxR3StaticNoCrt_TOOL.win.x86)_LIB)/libcmt.lib
+  VBoxSupLib_LIBS.win.amd64 = \
+        $(PATH_TOOL_$(TEMPLATE_VBoxR3StaticNoCrt_TOOL.win.amd64)_LIB)/libcmt.lib
+ endif
 endif
 VBoxSupLib_VBOX_IMPORT_CHECKER.win.x86   = xp