Changeset 6620 in vbox

Timestamp:

Jan 30, 2008 6:08:07 PM (17 years ago)

Author:

vboxsync

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

27681

Message:

it was supposed to be ifdef TEMPLATE_VBOXGUESTR3EXE_TOOL, just some cut and paste issues there. Fixed the way it should be and made it less convoluted.

File:

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

trunk/Config.kmk

@@ -2703 +2703 @@
 #
 # Template for building R3 programs for the guest additions.
+# Note: Make sure you don't break VBOXGUESTR3CPPEXE when changing this.
 #
 # For the time being, we force 32-bitness onto this and related
-# templates (BLD_TRG_ARCH). When we start doing 64-bit guest however,
-# they will be reverted to BUILD_TARGET_ARCH.
-#
-TEMPLATE_VBOXGUESTR3EXE         = VBox Guest Program
+# templates (via BLD_TRG_ARCH). When we start doing 64-bit guest
+# however, they will be reverted to follow BUILD_TARGET_ARCH.
+# So, if someone sees any weirdness happening in a 64-bit build now,
+# try do a 32-bit cross build (kmk BUILD_TARGET_ARCH=x86) first. It
+#
+TEMPLATE_VBOXGUESTR3EXE           = VBox Guest Program
 ifeq ($(BUILD_TARGET),win) # quick hack
-TEMPLATE_VBOXGUESTR3EXE_EXTENDS = VBOXW32GUESTR3
-else
-TEMPLATE_VBOXGUESTR3EXE_EXTENDS = VBOXR3EXE
-#TEMPLATE_VBOXGUESTR3EXE_TOOL   := $(subst GXX,GCC,$(TEMPLATE_VBOXR3EXE_TOOL))
-TEMPLATE_VBOXGUESTR3EXE_TOOL   := $(subst GXX,GCC,$(VBOX_GCC32_TOOL))
-TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS= $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -fno-exceptions
-endif
-TEMPLATE_VBOXGUESTR3EXE_INST    = $(INST_ADDITIONS)
-TEMPLATE_VBOXGUESTR3EXE_ASFLAGS = $(VBOX_ASFLAGS32)
+ TEMPLATE_VBOXGUESTR3EXE_EXTENDS  = VBOXW32GUESTR3
+else
+ TEMPLATE_VBOXGUESTR3EXE_EXTENDS  = VBOXR3EXE
+ #TEMPLATE_VBOXGUESTR3EXE_TOOL   := $(subst GXX,GCC,$(TEMPLATE_VBOXR3EXE_TOOL))
+ TEMPLATE_VBOXGUESTR3EXE_TOOL    := $(subst GXX,GCC,$(VBOX_GCC32_TOOL))
+ TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -fno-exceptions
+endif
+TEMPLATE_VBOXGUESTR3EXE_INST      = $(INST_ADDITIONS)
+TEMPLATE_VBOXGUESTR3EXE_ASFLAGS   = $(VBOX_ASFLAGS32)
 TEMPLATE_VBOXGUESTR3EXE_BLD_TRG_ARCH  = x86
 TEMPLATE_VBOXGUESTR3EXE_BLD_TRG_CPU   = blend
-TEMPLATE_VBOXGUESTR3EXE_DEFS   := IN_GUEST IN_GUEST_R3 IN_RT_R3 \
-                                  $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR3EXE_DEFS)) HC_ARCH_BITS=32 GC_ARCH_BITS=32
+TEMPLATE_VBOXGUESTR3EXE_DEFS     := IN_GUEST IN_GUEST_R3 IN_RT_R3 \
+                                    $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR3EXE_DEFS)) HC_ARCH_BITS=32 GC_ARCH_BITS=32
 
 #
@@ -2749 +2752 @@
 endif
 
+
+#
+# Template for guest stuff that makes use of the C++ library and features.
+# (This is mostly about undoing what was done to C++ for VBOXGUESTR3EXE.)
+#
+TEMPLATE_VBOXGUESTR3CPPEXE         = VBox Guest Program with C++ library dependencies
+TEMPLATE_VBOXGUESTR3CPPEXE_EXTENDS = VBOXGUESTR3EXE
+ifeq ($(BUILD_TARGET),win)
+ # later
+else
+ #TEMPLATE_VBOXGUESTR3CPPEXE_TOOL  = $(TEMPLATE_VBOXR3EXE_TOOL)
+ TEMPLATE_VBOXGUESTR3CPPEXE_TOOL   = $(VBOX_GCC32_TOOL)
+ TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS)
+endif
+
+
 #
 # Template for building R0 drivers for the guest additions.
@@ -2767 +2786 @@
 TEMPLATE_VBOXGUESTR0LIB_EXTENDS = VBOXGUESTR0
 TEMPLATE_VBOXGUESTR0LIB_INST    = $(INST_ADDITIONS_LIB)
-
-#
-# Template for guest stuff that makes use of the C++ library and features.
-#
-TEMPLATE_VBOXGUESTR3CPPEXE         = VBox Guest Program with C++ library dependencies
-TEMPLATE_VBOXGUESTR3CPPEXE_EXTENDS = VBOXGUESTR3EXE
-ifndef TEMPLATE_VBOXGUESTR3CPPEXE_TOOL
- TEMPLATE_VBOXGUESTR3CPPEXE_TOOL  := $(subst GCC,GXX,$(VBOX_GCC32_TOOL))
- TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS = $(filter-out -fno-exceptions,$(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS))
-endif