Changeset 25209 in vbox

Timestamp:

Dec 7, 2009 1:30:55 PM (15 years ago)

Author:

vboxsync

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

55700

Message:

/Makefile.kmk: don't try do all & packing in one go because the packing pass doesn't necessarily contain all the dependencies (windows).

File:

• trunk/Makefile.kmk (modified) (8 diffs)

trunk/Makefile.kmk

@@ -700 +700 @@
         KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
         KBUILD_TARGET_ARCH=amd64 BUILD_TARGET_ARCH=amd64 \
-        VBOX_SVN_REV=$(VBOX_SVN_REV) \
-        all packing
+        VBOX_SVN_REV=$(VBOX_SVN_REV)
 
 VBOX_ADDITIONS_BUILD.x86 = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 \
         KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
         KBUILD_TARGET_ARCH=x86 BUILD_TARGET_ARCH=x86 \
-        VBOX_SVN_REV=$(VBOX_SVN_REV) \
-        all packing
+        VBOX_SVN_REV=$(VBOX_SVN_REV)
 
 # Automatically determine the additions build subdir name. Used for figuring
@@ -717 +715 @@
 additions-build-win.amd64:
 ifeq ($(KBUILD_TARGET),win)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADD_HOST_OPT_TWEAK) $(VBOX_ADDITIONS_BUILD.amd64)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing
 else
         $(call MSG_L1,Building Windows/amd64 additions)
@@ -725 +724 @@
 additions-build-win.x86:
 ifeq ($(KBUILD_TARGET),win)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADD_HOST_OPT_TWEAK) $(VBOX_ADDITIONS_BUILD.x86)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing
 else
         $(call MSG_L1,Building Windows/x86 additions)
@@ -733 +733 @@
 additions-build-solaris.amd64:
 ifeq ($(KBUILD_TARGET),solaris)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADD_HOST_OPT_TWEAK) $(VBOX_ADDITIONS_BUILD.amd64)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing
 else
         $(call MSG_L1,Building Solaris/amd64 additions)
@@ -744 +745 @@
 additions-build-solaris.x86:
 ifeq ($(KBUILD_TARGET),solaris)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADD_HOST_OPT_TWEAK) $(VBOX_ADDITIONS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 all $(VBOX_ADD_HOST_BUILD_TWEAK)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 packing
 else
         $(call MSG_L1,Building Solaris/x86 additions)
@@ -754 +756 @@
 additions-build-os2.x86:
 #ifeq ($(KBUILD_TARGET),os2)
-#       + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86)
+#       + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
+#       + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing
 #else
 #       $(VBOX_KMK_TIME) ssh [email protected] " cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) "
@@ -761 +764 @@
 additions-build-linux.amd64:
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADD_HOST_OPT_TWEAK) $(VBOX_ADDITIONS_BUILD.amd64)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing
 else
         $(call MSG_L1,Building Linux/amd64 additions)
@@ -769 +773 @@
 additions-build-linux.x86:
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADD_HOST_OPT_TWEAK) $(VBOX_ADDITIONS_BUILD.x86)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing
 else
         $(call MSG_L1,Building Linux/x86 additions)