Changeset 98947 in vbox for trunk/Makefile.kmk

Timestamp:

Mar 13, 2023 11:01:03 PM (21 months ago)

Author:

vboxsync

Message:

/Makefile.kmk: additions-build-win.amd64 no longer needs to depend on additions-build-win.x86 for packing. bugref:10348

File:

• trunk/Makefile.kmk (modified) (1 diff)

trunk/Makefile.kmk

@@ -1212 +1212 @@
 VBOX_ADDITIONS_BUILD_SUBDIRNAME := $(lastword $(subst /, ,$(PATH_ROOT)))
 
-# When building in parallel on a Windows host, make sure we finish the host
-# bit before kicking off any UNIX guest or we'll run into file sharing issues.
 ifeq ($(KBUILD_TARGET),win)
- VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST = #additions-build-win.x86 additions-build-win.amd64
-else
- VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST =
-endif
-
-# ASSUMES the 32-bit edition has been built already. Also for serializing VM access.
-ifeq ($(KBUILD_TARGET),win)
- additions-build-win.amd64-just-build:
+ additions-build-win.amd64:
         + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)
- additions-build-win.amd64: additions-build-win.x86 additions-build-win.amd64-just-build
         + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing
 else
- additions-build-win.amd64: additions-build-win.x86
+ additions-build-win.amd64:
         $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 additions build+pack)
         $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) ' cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing '