Changeset 8757

Timestamp:

05/11/08 20:19:50 (8 months ago)

Author:

vboxsync

Message:

BUILD_PLATFORM* -> KBUILD_HOST*.

Files:

• trunk/Config.kmk (modified) (14 diffs)
• trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Additions/freebsd/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Additions/solaris/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Devices/testcase/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Installer/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Installer/linux/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Installer/solaris/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Runtime/Makefile.kmk (modified) (3 diffs)
• trunk/src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/VMM/testcase/Makefile.kmk (modified) (2 diffs)
• trunk/src/recompiler/Makefile.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -623 +623 @@
- else
-  VBOX_GCC_TOOL := GXX3
-BUILD_PLATFORM_ARCH),x86.amd64)
+KBUILD_HOST_ARCH),x86.amd64) ## @todo mixing target/host here!
-   VBOX_GCC_TOOL := GXX32
-   VBOX_WITH_VBOXDRV=
-   VBOX_WITH_LINUX_ADDITIONS=
-   VBOX_WITH_WIN32_ADDITIONS=
-BUILD_PLATFORM
+KBUILD_HOST
-   VBOX_GCC_TOOL := GXX64
-   VBOX_WITH_VBOXDRV=
@@ -670 +670 @@
-PATH_DEVTOOLS ?= $(PATH_ROOT)/tools
-PATH_DEVTOOLS := $(abspath $(PATH_DEVTOOLS))
-BUILD_PLATFORM).$(BUILD_PLATFORM
+KBUILD_HOST).$(KBUILD_HOST
-PATH_DEVTOOLS_TRG ?= $(PATH_DEVTOOLS)/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)
-
@@ -933 +933 @@
-
-# libxslt XSLT processor. (see PATH_TOOL_YASM for explanation why it's temporarily located in bin.)
-BUILD_PLATFORM
+KBUILD_HOST
-# VBOX_XSLTPROC ?= $(PATH_DEVTOOLS)/win.x86/libxslt/10114/xsltproc.exe
- VBOX_XSLTPROC ?= $(PATH_DEVTOOLS)/win.x86/bin/xsltproc.exe
-BUILD_PLATFORM
+KBUILD_HOST
- VBOX_XSLTPROC ?= BEGINLIBPATH="$(PATH_DEVTOOLS_BLD)/bin;$$BEGINLIBPATH" $(PATH_DEVTOOLS_BLD)/bin/xsltproc.exe
-else
@@ -946 +946 @@
-
-# mkisofs
-BUILD_PLATFORM
+KBUILD_HOST
- VBOX_MKISOFS  ?= $(PATH_DEVTOOLS_BLD)/bin/mkisofs.exe
-else
@@ -970 +970 @@
-# We need to export YASM for OSE, but since it was converted to .zip we need to
-# allow for the location used by the zip to be properly cleaned up first.
-BUILD_PLATFORM).$(BUILD_PLATFORM
+KBUILD_HOST).$(KBUILD_HOST
- PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
-endif
@@ -1083 +1083 @@
-# These tests never worked on Windows because of /dev/null, so, there
-# can be no harm in just dropping them until cygwin is mp safe.
-BUILD_PLATFORM
+KBUILD_HOST
-VBOX_GCC_CHECK_CC = $(2)
-VBOX_GCC_CHECK_CXX = $(2)
@@ -1110 +1110 @@
-endif
-
-BUILD_PLATFORM
+KBUILD_HOST
-# This isn't important (yet) on windows, so cook the result until
-# cygwin is feeling better.
@@ -1159 +1159 @@
-# Find the compiler includes for IPRT no-crt.
-# Note that `$(dir $(gcc -print-libgcc-file-name))/include does not work for a 64-bit cross build on a 32-bit build host.
-BUILD_PLATFORM
+KBUILD_HOST
-# With the cygwin issues and gcc on windows returning a useless path, just skip this on windows.
-        $(APPEND) '$@' 'VBOX_PATH_GCC_INCS             ?= '
@@ -1178 +1178 @@
-#
-ifdef VBOX_SIGNING_MODE
-BUILD_PLATFORM
+KBUILD_HOST
-  # VBOX_PATH_SELFSIGN points to the Vista WDK bin/SelfSign directory.
-  ifndef VBOX_PATH_SELFSIGN
@@ -1435 +1435 @@
- LIB_QT ?= qt-mt
-endif
-BUILD_PLATFORM
+KBUILD_HOST
- VBOX_PATH_QT_HOST ?= $(VBOX_PATH_QT)
-else
@@ -1837 +1837 @@
-ifdef VBOX_WITH_VBOXDRV
- ifndef TEMPLATE_VBOXR0DRV_TOOL
-BUILD_PLATFORM
+KBUILD_HOST
- endif
-endif
@@ -2441 +2441 @@
-TEMPLATE_VBOXBLDPROG  = VBox Build Program
-TEMPLATE_VBOXBLDPROG_DEFS                = IN_RING3
-BUILD_PLATFORM
-BUILD_PLATFORM
+KBUILD_HOST
+KBUILD_HOST
-  ifdef VBOX_USE_VCC80
-   TEMPLATE_VBOXBLDPROG_TOOL             = VCC80X86
@@ -2499 +2499 @@
-TEMPLATE_VBOXBLDPROG_LDFLAGS.x86         = -m32
-TEMPLATE_VBOXBLDPROG_LDFLAGS.amd64       = -m64
-BUILD_PLATFORM
+KBUILD_HOST
-TEMPLATE_VBOXBLDPROG_LIBS                = pthread m rt dl
-BUILD_PLATFORM
+KBUILD_HOST
-TEMPLATE_VBOXBLDPROG_TOOL                = GXX3OMF
-TEMPLATE_VBOXBLDPROG_LIBS                = socket iconv
-BUILD_PLATFORM
+KBUILD_HOST
-TEMPLATE_VBOXBLDPROG_TOOL                = GXX4MACHO
-TEMPLATE_VBOXBLDPROG_LIBS                =
-BUILD_PLATFORM
+KBUILD_HOST
-TEMPLATE_VBOXBLDPROG_TOOL                = GXX3
-TEMPLATE_VBOXBLDPROG_LIBS                =
-BUILD_PLATFORM
+KBUILD_HOST
-TEMPLATE_VBOXBLDPROG_TOOL                = GXX3PLAIN
-TEMPLATE_VBOXBLDPROG_LIBS                = rt
- else
-BUILD_PLATFORM
+KBUILD_HOST
- endif
-
@@ -2653 +2653 @@
-# (Some (old) Wine versions fails loading msvcrt.dll from the VCC bin directory.)
-#
-BUILD_PLATFORM
+KBUILD_HOST
- TOOL_VCC80X86_RC   := $(EXEC_X86_WIN32) $(PATH_DEVTOOLS)/win.x86/bin/rc.exe
- TOOL_VCC80AMD64_RC := $(EXEC_X86_WIN32) $(PATH_DEVTOOLS)/win.x86/bin/rc.exe

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -24 +24 @@
-include $(PATH_KBUILD)/subheader.kmk
-
-BUILD_PLATFORM
+KBUILD_HOST
- ifdef VBOX_WITH_OS2_ADDITIONS
-  PROGRAMS += VBoxService

trunk/src/VBox/Additions/freebsd/Makefile.kmk

@@ -24 +24 @@
-include $(PATH_KBUILD)/subheader.kmk
-
-BUILD_PLATFORM
+KBUILD_HOST
-$(error "The FreeBSD guest additions installer can only be built on FreeBSD!")
-endif

trunk/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk

@@ -24 +24 @@
-include $(PATH_KBUILD)/subheader.kmk
-
-BUILD_PLATFORM
+KBUILD_HOST
-$(error "The FreeBSD guest additions can only be built on FreeBSD!")
-endif

trunk/src/VBox/Additions/solaris/Makefile.kmk

@@ -24 +24 @@
-include $(PATH_KBUILD)/subheader.kmk
-
-BUILD_PLATFORM
+KBUILD_HOST
-$(error "The Solaris guest additions installer can only be built on Solaris!")
-endif
-
-BUILD_PLATFORM
+KBUILD_HOST
- include $(PATH_SUB_CURRENT)/SharedFolders/Makefile.kmk
-endif

trunk/src/VBox/Devices/testcase/Makefile.kmk

@@ -28 +28 @@
-# validation testcases. Perhaps a bit hackish, but extremely useful.
-#
-BUILD_PLATFORM
-BUILD_PLATFORM
+KBUILD_HOST
+KBUILD_HOST
-  OTHERS += \
-        $(PATH_TARGET)/tstDeviceStructSize.run

trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk

@@ -43 +43 @@
-endif # VBOX_WITH_TESTCASES
-
-BUILD_PLATFORM
-BUILD_PLATFORM
+KBUILD_HOST
+KBUILD_HOST
-   OTHERS += \
-    $(PATH_TARGET)/tstShflSizes.run

trunk/src/VBox/Installer/Makefile.kmk

@@ -23 +23 @@
-include $(PATH_KBUILD)/header.kmk
-
-BUILD_PLATFORM
+KBUILD_HOST
- SUBDIRS.win = win
-endif
-BUILD_PLATFORM
+KBUILD_HOST
- SUBDIRS.linux = linux
-endif
-BUILD_PLATFORM
+KBUILD_HOST
- SUBDIRS.darwin = darwin
-endif
-BUILD_PLATFORM
+KBUILD_HOST
- SUBDIRS.solaris = solaris
-endif

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -23 +23 @@
-include $(PATH_KBUILD)/header.kmk
-
-BUILD_PLATFORM
+KBUILD_HOST
-$(error "The Linux installer can only be built on Linux!") # yeah, right.
-endif

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -23 +23 @@
-include $(PATH_KBUILD)/header.kmk
-
-BUILD_PLATFORM
+KBUILD_HOST
-$(error "The Solaris installer can only be built on Solaris!") # yeah, right.
-endif

trunk/src/VBox/Runtime/Makefile.kmk

@@ -542 +542 @@
-RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS))
-RuntimeGuestR3_DEFS.$(BUILD_TARGET)     := $(RuntimeR3_DEFS.$(BUILD_TARGET))
-BUILD_PLATFORM)  := $(RuntimeR3_DEFS.$(BUILD_PLATFORM
+KBUILD_HOST)     := $(RuntimeR3_DEFS.$(KBUILD_HOST
-RuntimeGuestR3_INCS                     := $(RuntimeR3_INCS)
-RuntimeGuestR3_INCS.$(BUILD_TARGET)     := $(RuntimeR3_INCS.$(BUILD_TARGET))
-BUILD_PLATFORM)   := $(RuntimeR3_INCS.$(BUILD_PLATFORM
+KBUILD_HOST)   := $(RuntimeR3_INCS.$(KBUILD_HOST
-RuntimeGuestR3_SOURCES                  := $(filter-out \
-        common/time/timesupref.cpp \
@@ -556 +556 @@
-        VBox/logbackdoor.cpp
-RuntimeGuestR3_SOURCES.$(BUILD_TARGET)  := $(RuntimeR3_SOURCES.$(BUILD_TARGET))
-BUILD_PLATFORM):= $(RuntimeR3_SOURCES.$(BUILD_PLATFORM
+KBUILD_HOST):= $(RuntimeR3_SOURCES.$(KBUILD_HOST
-RuntimeGuestR3_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
-BUILD_PLATFORM).$(BUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(BUILD_PLATFORM
+KBUILD_HOST).$(BUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_HOST
-RuntimeGuestR3_SOURCES.$(BUILD_TARGET).x86 := $(RuntimeR3_SOURCES.$(BUILD_TARGET).x86)
-BUILD_PLATFORM).x86 := $(RuntimeR3_SOURCES.$(BUILD_PLATFORM
+KBUILD_HOST).x86 := $(RuntimeR3_SOURCES.$(KBUILD_HOST
-
-
@@ -573 +573 @@
-RuntimeGuestR3Mini_DEFS                     := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS)) RT_MINI
-RuntimeGuestR3Mini_DEFS.$(BUILD_TARGET)     := $(RuntimeR3_DEFS.$(BUILD_TARGET))
-BUILD_PLATFORM)   := $(RuntimeR3_DEFS.$(BUILD_PLATFORM
+KBUILD_HOST)   := $(RuntimeR3_DEFS.$(KBUILD_HOST
-RuntimeGuestR3Mini_INCS                     := $(RuntimeR3_INCS)
-RuntimeGuestR3Mini_INCS.$(BUILD_TARGET)     := $(RuntimeR3_INCS.$(BUILD_TARGET))
-BUILD_PLATFORM)   := $(RuntimeR3_INCS.$(BUILD_PLATFORM
+KBUILD_HOST)   := $(RuntimeR3_INCS.$(KBUILD_HOST
-RuntimeGuestR3Mini_SOURCES = \
-        common/err/errmsg.cpp \

trunk/src/VBox/VMM/Makefile.kmk

@@ -201 +201 @@
-VBoxVMM_LDFLAGS.solaris = -mimpure-text
-ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
-BUILD_PLATFORM
+KBUILD_HOST
-VBoxVMM_LIBS += aio
- endif

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -47 +47 @@
-# validation testcases. Perhaps a bit hackish, but extremely useful.
-#
-BUILD_PLATFORM
-BUILD_PLATFORM
+KBUILD_HOST
+KBUILD_HOST
-  OTHERS          += \
-        $(PATH_TARGET)/tstAsmStructs.run \
@@ -206 +206 @@
-#
-
-BUILD_PLATFORM
+KBUILD_HOST
- include $(PATH_KBUILD)/tools/MINGW32.kmk
- VBOX_NM ?= $(PATH_TOOL_MINGW32)/bin/nm.exe -p

trunk/src/recompiler/Makefile.kmk

@@ -73 +73 @@
-# The dyngen build tool.
-#
-BUILD_PLATFORM
+KBUILD_HOST
- dyngen_TOOL          = MINGW32
- dyngen_SDKS          = W32API
@@ -241 +241 @@
-testmath_TOOL.win.x86   = MINGW32
-testmath_SDKS.win.x86   = W32API
-BUILD_PLATFORM).$(BUILD_PLATFORM
+KBUILD_HOST).$(KBUILD_HOST
- # 64-bit windows: Pretend to be 32-bit.
- testmath_BLD_TRG       = win32
@@ -248 +248 @@
-endif
-testmath_ASTOOL         = $(VBOX_ASTOOL)
-BUILD_PLATFORM
+KBUILD_HOST
- testmath_ASFLAGS        = -f win32 -DNASM_FORMAT_PE $(VBOX_ASFLAGS) -w+orphan-labels
-else
@@ -442 +442 @@
-DYNGEN = $(PATH_dyngen)/dyngen$(HOSTSUFF_EXE)
-DYNGEN_EXEC = $(DYNGEN)
-BUILD_PLATFORM
+KBUILD_HOST
- ifeq ($(BUILD_TARGET),win)
-  DYNGEN       = $(PATH_dyngen)/dyngen.exe