Index: /trunk/src/VBox/Installer/solaris/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 61597)
+++ /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 61598)
@@ -566,7 +566,8 @@
 		$(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT) && !defined(VBOX_WITH_QTGUI_V5),$(VBOX_PATH_QT)/bin/qtconfig,) \
 		$(if-expr defined(VBOX_WITH_ADDITIONS_PACKING),$(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.iso,) \
-		$(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL),$(PATH_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2,) \
+		$(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL), $(PATH_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2,) \
 		\
-		$(foreach arch, x86 amd64, $(foreach lib, libgcc_s.so.1 libstdc++.so.6, $(PATH_DEVTOOLS)/solaris.$(arch)/s10libs/$(lib))) \
+		$(if $(VBOX_OSE),,$(foreach arch, x86 amd64, $(foreach lib, libgcc_s.so.1 libstdc++.so.6, \
+			$(PATH_DEVTOOLS)/solaris.$(arch)/s10libs/$(lib)))) \
 		\
 		$(foreach var, $(SOLARIS_FILE_LIST_VARS),$(foreach file, $($(var)), $($(var).SRC)/$(file))) \
@@ -586,7 +587,7 @@
 		$(VBOX_PATH_SI_SCRATCH_PKG)/opt/ \
 		$(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/ \
-		$(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/legacy \
+		$(if-$(VBOX_OSE),,$(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/legacy/) \
 		$(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/amd64/ \
-		$(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/amd64/legacy/ \
+		$(if $(VBOX_OSE),,$(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/amd64/legacy/) \
 		$(VBOX_PATH_SI_SCRATCH_PKG)/platform/ \
 		$(VBOX_PATH_SI_SCRATCH_PKG)/platform/i86pc/ \
@@ -646,7 +647,7 @@
 		$(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/libSDL-1.2.so.0,)
 
-	$(foreach arch, x86 amd64, $(foreach lib, libgcc_s.so.1 libstdc++.so.6 \
+	$(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) \
-		$(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(if-expr $(arch) == "amd64",amd64/,)legacy/$(lib)))
+		$(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(if-expr $(arch) == "amd64",amd64/,)legacy/$(lib))))
 
 	$(if-expr defined(VBOX_WITH_EFIFW_PACKING) \
Index: /trunk/src/VBox/Installer/solaris/vboxconfig.sh
===================================================================
--- /trunk/src/VBox/Installer/solaris/vboxconfig.sh	(revision 61597)
+++ /trunk/src/VBox/Installer/solaris/vboxconfig.sh	(revision 61598)
@@ -1254,13 +1254,15 @@
 
         # Install the S10 legacy library links if necessary
-        if ldd /opt/VirtualBox/amd64/VBoxRT-x86.so | grep "not found" > /dev/null; then
-            for lib in `ls -1 /opt/VirtualBox/legacy/`; do
-                ln -sf legacy/$lib /opt/VirtualBox/$lib
-            done
-        fi
-        if ldd /opt/VirtualBox/amd64/VBoxRT.so | grep "not found" > /dev/null; then
-            for lib in `ls -1 /opt/VirtualBox/amd64/legacy/`; do
-                ln -sf legacy/$lib /opt/VirtualBox/amd64/$lib
-            done
+        if -d /opt/VirtualBox/legacy/; then
+            if ldd /opt/VirtualBox/amd64/VBoxRT-x86.so | grep "not found" > /dev/null; then
+                for lib in `ls -1 /opt/VirtualBox/legacy/`; do
+                    ln -sf legacy/$lib /opt/VirtualBox/$lib
+                done
+            fi
+            if ldd /opt/VirtualBox/amd64/VBoxRT.so | grep "not found" > /dev/null; then
+                for lib in `ls -1 /opt/VirtualBox/amd64/legacy/`; do
+                    ln -sf legacy/$lib /opt/VirtualBox/amd64/$lib
+                done
+            fi
         fi