Changeset 60005 in vbox

Timestamp:

Mar 13, 2016 12:51:44 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: more fixes.

File:

• trunk/src/VBox/ValidationKit/bootsectors/Config.kmk (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/Config.kmk

@@ -429 +429 @@
 TEMPLATE_VBoxBS3KitImg = Template for building BS3Kit test images.
 TEMPLATE_VBoxBS3KitImg_BLD_TRG      = os-agnostic
-TEMPLATE_VBoxBS3KitImg_BLD_TRG_ARCH = x86
+TEMPLATE_VBoxBS3KitImg_BLD_TRG_ARCH = noarch
 TEMPLATE_VBoxBS3KitImg_INST         = $(INST_VALIDATIONKIT)bootsectors/
 TEMPLATE_VBoxBS3KitImg_BINSUFF      = .img
@@ -452 +452 @@
 TEMPLATE_VBoxBS3KitImg_CXXFLAGS     = \
         -nt=BS3TEXT16 -nd=BS3DATA16 -nc=BS3CODE16 -ecw -q -0 -wx -zl -zdp -zu -mc $(BS3_OW_DBG_OPT) -d1 -s -oa -ob -of -oi -ol -or -os -d+
-TEMPLATE_VBoxBS3KitImg_CDEFS        = ARCH_BITS=16
+TEMPLATE_VBoxBS3KitImg_CDEFS        = ARCH_BITS=16 RT_ARCH_X86
 
 TEMPLATE_VBoxBS3KitImg_TOOL         = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBoxBS3KitImg_C16TOOL      = $(TEMPLATE_VBoxBS3KitImg_CTOOL)
 TEMPLATE_VBoxBS3KitImg_C16FLAGS     = $(TEMPLATE_VBoxBS3KitImg_CFLAGS)
-TEMPLATE_VBoxBS3KitImg_C16DEFS      = ARCH_BITS=16
+TEMPLATE_VBoxBS3KitImg_C16DEFS      = $(TEMPLATE_VBoxBS3KitImg_CDEFS)
 TEMPLATE_VBoxBS3KitImg_C32TOOL     := Bs3Ow32
 TEMPLATE_VBoxBS3KitImg_C32FLAGS     = $(TEMPLATE_VBoxBS3KitImg32_CFLAGS)
-TEMPLATE_VBoxBS3KitImg_C32DEFS      = ARCH_BITS=32
+TEMPLATE_VBoxBS3KitImg_C32DEFS      = ARCH_BITS=32 RT_ARCH_X86
 TEMPLATE_VBoxBS3KitImg_C64TOOL      = $(TEMPLATE_VBoxBS3KitImg64_CTOOL)
 TEMPLATE_VBoxBS3KitImg_C64FLAGS     = $(TEMPLATE_VBoxBS3KitImg64_CFLAGS)
-TEMPLATE_VBoxBS3KitImg_C64DEFS      = ARCH_BITS=64
+TEMPLATE_VBoxBS3KitImg_C64DEFS      = ARCH_BITS=64 RT_ARCH_AMD64
 
 TEMPLATE_VBoxBS3KitImg_INCS         = $(VBOX_PATH_BS3KIT_SRC) .