Changeset 6730 in vbox for trunk/src

Timestamp:

Feb 1, 2008 6:31:59 PM (17 years ago)

Author:

vboxsync

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

27812

Message:

Made crossbuilding the linux additions in an l4 build work again. Needed to adjust LIBS in the VBOXGUESTR3EXE template and inherit for both BUILD_TARGET and BUILD_PLATFORM in runtime.

File:

• trunk/src/VBox/Runtime/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -491 +491 @@
 #
 # RuntimeGuestR3 - Guest Additions Runtime (static).
-#
-RuntimeGuestR3_TEMPLATE             := VBOXGUESTR3LIB
-RuntimeGuestR3_SDKS.win             := $(RuntimeR3_SDKS.win)
-RuntimeGuestR3_DEFS                 := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS))
-RuntimeGuestR3_DEFS.$(BUILD_TARGET) := $(RuntimeR3_DEFS.$(BUILD_TARGET))
-RuntimeGuestR3_INCS                 := $(RuntimeR3_INCS)
-RuntimeGuestR3_INCS.$(BUILD_TARGET) := $(RuntimeR3_INCS.$(BUILD_TARGET))
-RuntimeGuestR3_SOURCES              := $(filter-out \
+# (The BUILD_PLATFORM inheritance here is for l4 crossbuilding the linux additions.)
+#
+RuntimeGuestR3_TEMPLATE                 := VBOXGUESTR3LIB
+RuntimeGuestR3_SDKS.win                 := $(RuntimeR3_SDKS.win)
+RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS))
+RuntimeGuestR3_DEFS.$(BUILD_TARGET)     := $(RuntimeR3_DEFS.$(BUILD_TARGET))
+RuntimeGuestR3_DEFS.$(BUILD_PLATFORM)   := $(RuntimeR3_DEFS.$(BUILD_PLATFORM))
+RuntimeGuestR3_INCS                     := $(RuntimeR3_INCS)
+RuntimeGuestR3_INCS.$(BUILD_TARGET)     := $(RuntimeR3_INCS.$(BUILD_TARGET))
+RuntimeGuestR3_INCS.$(BUILD_PLATFORM)   := $(RuntimeR3_INCS.$(BUILD_PLATFORM))
+RuntimeGuestR3_SOURCES                  := $(filter-out \
         common/time/timesupref.cpp \
         common/time/timesupA.asm \
@@ -507 +510 @@
         common/time/timesysalias.cpp \
         VBox/logbackdoor.cpp
-RuntimeGuestR3_SOURCES.$(BUILD_TARGET) := $(RuntimeR3_SOURCES.$(BUILD_TARGET))
-RuntimeGuestR3_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
+RuntimeGuestR3_SOURCES.$(BUILD_TARGET)  := $(RuntimeR3_SOURCES.$(BUILD_TARGET))
+RuntimeGuestR3_SOURCES.$(BUILD_PLATFORM):= $(RuntimeR3_SOURCES.$(BUILD_PLATFORM))
+RuntimeGuestR3_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
+RuntimeGuestR3_SOURCES.$(BUILD_PLATFORM).$(BUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(BUILD_PLATFORM).$(BUILD_TARGET_ARCH))
 
 
@@ -516 +521 @@
 #                      for X11 drivers, GRADD and similar.
 #
-RuntimeGuestR3Mini_TEMPLATE             := VBOXGUESTR3DLL
-RuntimeGuestR3Mini_INST                 := $(INST_ADDITIONS_LIB)
-RuntimeGuestR3Mini_SDKS.win             := $(RuntimeR3_SDKS.win)
-RuntimeGuestR3Mini_DEFS                 := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS)) \
-                                           RT_MINI
-RuntimeGuestR3Mini_DEFS.$(BUILD_TARGET) := $(RuntimeR3_DEFS.$(BUILD_TARGET))
-RuntimeGuestR3Mini_INCS                 := $(RuntimeR3_INCS)
-RuntimeGuestR3Mini_INCS.$(BUILD_TARGET) := $(RuntimeR3_INCS.$(BUILD_TARGET))
-RuntimeGuestR3Mini_SOURCES               = \
+RuntimeGuestR3Mini_TEMPLATE                 := VBOXGUESTR3DLL
+RuntimeGuestR3Mini_INST                     := $(INST_ADDITIONS_LIB)
+RuntimeGuestR3Mini_SDKS.win                 := $(RuntimeR3_SDKS.win)
+RuntimeGuestR3Mini_DEFS                     := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS)) RT_MINI
+RuntimeGuestR3Mini_DEFS.$(BUILD_TARGET)     := $(RuntimeR3_DEFS.$(BUILD_TARGET))
+RuntimeGuestR3Mini_DEFS.$(BUILD_PLATFORM)   := $(RuntimeR3_DEFS.$(BUILD_PLATFORM))
+RuntimeGuestR3Mini_INCS                     := $(RuntimeR3_INCS)
+RuntimeGuestR3Mini_INCS.$(BUILD_TARGET)     := $(RuntimeR3_INCS.$(BUILD_TARGET))
+RuntimeGuestR3Mini_INCS.$(BUILD_PLATFORM)   := $(RuntimeR3_INCS.$(BUILD_PLATFORM))
+RuntimeGuestR3Mini_SOURCES = \
         common/err/errmsg.cpp \
         common/err/RTErrConvertFromErrno.cpp \
@@ -544 +550 @@
         r3/fs.cpp \
         r3/path.cpp
-RuntimeGuestR3Mini_SOURCES.linux         = \
+RuntimeGuestR3Mini_SOURCES.linux = \
         r3/posix/fileio-posix.cpp \
         r3/posix/path-posix.cpp \
         r3/posix/utf8-posix.cpp
-RuntimeGuestR3Mini_SOURCES.solaris       = \
+RuntimeGuestR3Mini_SOURCES.solaris = \
         r3/posix/fileio-posix.cpp \
         r3/posix/path-posix.cpp \
         r3/posix/utf8-posix.cpp
 # VBox specific stuff.
-RuntimeGuestR3Mini_SOURCES              += \
+RuntimeGuestR3Mini_SOURCES += \
         VBox/logbackdoor.cpp \
         VBox/logbackdoor-redirect.cpp \