Changeset 93323 in vbox

Timestamp:

Jan 18, 2022 3:33:31 PM (3 years ago)

Author:

vboxsync

Message:

VBoxSupLib: Use SUPR3HardenedStatic for getting /guard stuff objects in hardened builds. Fixed uplicate object in SUPR3HardenedStatic. bugref:8489 bugref:10162

File:

• trunk/src/VBox/HostDrivers/Support/Makefile.kmk (modified) (2 diffs)

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

@@ -441 +441 @@
    # These are for the /guard option.
    SUPR3HardenedStatic_SOURCES.win += \
-        $(SUPR3HardenedStatic_0_OUTDIR)/loadcfg.obj \
         $(SUPR3HardenedStatic_0_OUTDIR)/gs_cookie.obj \
         $(SUPR3HardenedStatic_0_OUTDIR)/guard_support.obj
@@ -537 +536 @@
         win/VBoxSupLib.rc
 VBoxSupLib_LIBS.win.x86 = \
-        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.x86)_LIB)/chkstk.obj
+        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.x86)_LIB)/chkstk.obj
 VBoxSupLib_LIBS.win.amd64 = \
-        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/chkstk.obj
+        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/chkstk.obj
+ifdef VBOX_WITH_HARDENING
+ VBoxSupLib_LIBS.win = $(SUPR3HardenedStatic_1_TARGET) # includes the rest of the /guard:cf support stuff.
+endif
 VBoxSupLib_VBOX_IMPORT_CHECKER.win.x86   = xp
 VBoxSupLib_VBOX_IMPORT_CHECKER.win.amd64 = xp64