Changeset 51221 in vbox for trunk

Timestamp:

May 9, 2014 7:03:12 AM (11 years ago)

Author:

vboxsync

Message:

Forward ported r93628 + r93629 (4.3: Windows host installer: Always take the common.cab from the amd64 build for multiarch builds, as it might contain certain files for x86 compatibility such as our 32-on-64-bit COM stuff, build fix).

File:

• trunk/src/VBox/Installer/win/Makefile.kmk (modified) (3 diffs)

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

@@ -114 +114 @@
  PACKAGE_NAME_FINAL                 := $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.$(KBUILD_TARGET_ARCH))
  PACKAGE_NAME_MULTIARCH_FINAL       := $(PACKAGE_NAME_MULTIARCH).exe
- PACKAGE_NAME_MULTIARCH_COMMONCAB   := common.cab
+ # Always take the common.cab from the amd64 build, as it
+ # might contain certain files for x86 compatibility such
+ # as our 32-on-64-bit COM stuff.
+ PACKAGE_NAME_MULTIARCH_COMMONCAB   := $(PATH_OUT_BASE)/win.amd64/$(KBUILD_TYPE)/obj/Installer/win/common.cab
 
  BLDDIRS += $(PATH_MULTIARCH_TEMP)
@@ -151 +154 @@
         $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \
         $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.am64) \
-        $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB)
+        $(PACKAGE_NAME_MULTIARCH_COMMONCAB)
  else
   # Nothing to do here yet.
@@ -777 +780 @@
                 $$(VBoxStubBld_1_TARGET)
         $(call MSG_L1,Building Windows combined package)
-        $(if $(VBOX_WITH_MSM_INSTALL),,$(call VBOX_SIGN_FILE_FN,$(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB)))
+        $(if $(VBOX_WITH_MSM_INSTALL),,$(call VBOX_SIGN_FILE_FN,$(PACKAGE_NAME_MULTIARCH_COMMONCAB)))
         $(REDIRECT) -C $(@D) -- \
                 $(VBoxStubBld_1_TARGET) -out $@ \
                         -target-x86 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \
                         -target-amd64 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.amd64) \
-                        $(if $(VBOX_WITH_MSM_INSTALL),,-target-all $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB)) \
+                        $(if $(VBOX_WITH_MSM_INSTALL),,-target-all $(PACKAGE_NAME_MULTIARCH_COMMONCAB)) \
                         -stub $(PATH_STAGE_BIN)/VBoxStub.exe
         $(call VBOX_SIGN_FILE_FN,$@)