Changeset 6134 in vbox

Timestamp:

Dec 18, 2007 4:46:11 PM (17 years ago)

Author:

vboxsync

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

26866

Message:

VBOXGUESTR3EXE/R0 DEFS fix (hope it works).

File:

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

trunk/Config.kmk

@@ -2655 +2655 @@
 TEMPLATE_VBOXGUESTR3EXE_BLD_TRG_ARCH  = x86
 TEMPLATE_VBOXGUESTR3EXE_BLD_TRG_CPU   = blend
-TEMPLATE_VBOXGUESTR3EXE_DEFS    = IN_RING3 IN_GUEST IN_GUEST_R3 IN_RT_R3 HC_ARCH_BITS=32 GC_ARCH_BITS=32
-ifeq ($(BUILD_TARGET),solaris)
- TEMPLATE_VBOXGUESTR3EXE_DEFS  += LIBICONV_PLUG _REENTRANT # Avoid the GNU libiconv, for now at least.
-endif
+TEMPLATE_VBOXGUESTR3EXE_DEFS   := $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR3EXE_DEFS)) IN_GUEST IN_GUEST_R3 HC_ARCH_BITS=32 GC_ARCH_BITS=32
 if1of ($(BUILD_TARGET),win)
  ## @todo make static TEMPLATE_VBOXGUESTR3EXE_LDFLAGS =
-else
- ifeq ($(BUILD_TARGET),solaris)
-  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(TEMPLATE_VBOXR3EXE_LDFLAGS)
- else
-  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(TEMPLATE_VBOXR3EXE_LDFLAGS) -static
- endif
+else if1of ($(BUILD_TARGET),linux)
+ TEMPLATE_VBOXGUESTR3EXE_DEFS  += IN_RT_R3
+ TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(TEMPLATE_VBOXR3EXE_LDFLAGS) -static
 endif
 
@@ -2681 +2675 @@
 TEMPLATE_VBOXGUESTR0            = VBox Guest Driver
 TEMPLATE_VBOXGUESTR0_EXTENDS    = VBOXR0DRV
+TEMPLATE_VBOXGUESTR0_INST       = $(INST_ADDITIONS)
+TEMPLATE_VBOXGUESTR0_BLD_TRG_ARCH   = x86
+TEMPLATE_VBOXGUESTR0_BLD_TRG_CPU    = blend
 TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = WIN32SDK W2K3DDKX86
 TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = W2K3DDK WINPSDKINCS
-TEMPLATE_VBOXGUESTR0_BLD_TRG_ARCH   = x86
-TEMPLATE_VBOXGUESTR0_BLD_TRG_CPU    = blend
-TEMPLATE_VBOXGUESTR0_INST       = $(INST_ADDITIONS)
-TEMPLATE_VBOXGUESTR0_DEFS       = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R0 HC_ARCH_BITS=32 GC_ARCH_BITS=32
+TEMPLATE_VBOXGUESTR0_DEFS       = $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR0DRV_DEFS)) IN_GUEST IN_GUEST_R0 HC_ARCH_BITS=32 GC_ARCH_BITS=32
 
 #