Changeset 61877 in vbox for trunk

Timestamp:

Jun 24, 2016 9:01:13 AM (9 years ago)

Author:

vboxsync

Message:

solaris fix: must not use the exact same path for different versions of the same tool

File:

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

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

@@ -552 +552 @@
 include $(FILE_KBUILD_SUB_FOOTER)
 
+PATH_S10LIBS.x86 := $(sort $(wildcard $(PATH_DEVTOOLS)/solaris.x86/s10libs/v*))
+ifneq ($(PATH_S10LIBS.x86),)
+ PATH_S10LIBS.x86 := $(call lastword,$(PATH_S10LIBS.x86))
+endif
+PATH_S10LIBS.amd64 := $(sort $(wildcard $(PATH_DEVTOOLS)/solaris.amd64/s10libs/v*))
+ifneq ($(PATH_S10LIBS.amd64),)
+ PATH_S10LIBS.amd64 := $(call lastword,$(PATH_S10LIBS.amd64))
+endif
+
 #
 # Creates the System V style installer package.
@@ -569 +578 @@
                 \
                 $(if $(VBOX_OSE),,$(foreach arch, x86 amd64, $(foreach lib, libgcc_s.so.1 libstdc++.so.6, \
-                        $(PATH_DEVTOOLS)/solaris.$(arch)/s10libs/$(lib)))) \
+                        $(PATH_S10LIBS.$(arch))/$(lib)))) \
                 \
                 $(if $(VBOX_OSE),,$(foreach arch, amd64, $(foreach lib, libxcb.so.1 libX11-xcb.so.1 libX11.so.4 libGL.so, \
@@ -651 +660 @@
 
         $(if $(VBOX_OSE),,$(foreach arch, x86 amd64, $(foreach lib, libgcc_s.so.1 libstdc++.so.6 \
-                ,$(NLTAB)$(INSTALL) -s -m 0644 $(PATH_DEVTOOLS)/solaris.$(arch)/s10libs/$(lib) \
+                ,$(NLTAB)$(INSTALL) -s -m 0644 $(PATH_S10LIBS.$(arch))/$(lib) \
                 $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(if-expr $(arch) == "amd64",amd64/,)legacy/$(lib))))