Changeset 98154 in vbox

Timestamp:

Jan 20, 2023 10:45:17 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155327

Message:

/Config.kmk: Tweaked VBoxR3StaticNoCrt to make VBoxSupLib build when targetting x86. bugref:10348 bugref:10261

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -6678 +6678 @@
 # Implies no fancy C++, no exceptions, no static constructors or destructors, ++.
 #
+# Note! Not compatible with BLD_TRG_ARCH overrides yet.
+#
 TEMPLATE_VBoxR3StaticNoCrt               = Static
 TEMPLATE_VBoxR3StaticNoCrt_EXTENDS       = VBoxR3Static
@@ -6694 +6696 @@
 TEMPLATE_VBoxR3StaticNoCrt_LIBS.amd64      = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBoxR3StaticNoCrt_LIBS.win        = $(NO_SUCH_VARIABLE)
+ ifdef VBOX_WITH_NOCRT_STATIC
+TEMPLATE_VBoxR3StaticNoCrt_LIBS.$(KBUILD_TARGET_ARCH) = \
+        $(PATH_STAGE_LIB)/RuntimeR3NoCrt$(VBOX_SUFF_LIB)
+  ifneq ($(KBUILD_TARGET_ARCH),x86)
+TEMPLATE_VBoxR3StaticNoCrt_LIBS.x86        = \
+        $(PATH_STAGE_LIB)/RuntimeR3NoCrt-x86$(VBOX_SUFF_LIB) # place holder, we don't have this library
+  endif
+ else
 TEMPLATE_VBoxR3StaticNoCrt_LIBS.win.x86    = \
         $(PATH_TOOL_$(TEMPLATE_VBoxR3StaticNoCrt_TOOL.win.x86)_LIB)/chkstk.obj
+ endif
 TEMPLATE_VBoxR3StaticNoCrt_SDKS.win.x86   += VBOX_WIN_INT64
 TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS         = $(filter-out $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3Static_LDFLAGS))