Changeset 9552 in vbox

Timestamp:

Jun 9, 2008 5:08:37 PM (17 years ago)

Author:

vboxsync

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

31838

Message:

64-bit guest preps. - The ing static C++ hacks. The gnu ld just ignored this, the solaris ld failed. very cool.

File:

• trunk/src/VBox/Additions/x11/xclient/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Additions/x11/xclient/Makefile.kmk

@@ -64 +64 @@
 # (It would've been preferred to avoid features depending on libstdc++, of course...)
 #
+# Actually, this is darn annoying and will *NOT* be tollerated for any new code!
+#
 VBoxClient_LIBPATH  += $(PATH_TARGET)/VBoxClient
 VBoxClient_ORDERDEPS = $(PATH_TARGET)/VBoxClient/libstdc++.a
@@ -70 +72 @@
         $(call MSG_L1,Forcing static libstdc++)
         $(QUIET)$(MKDIR) -p $(@D)
+ifdef VBOX_WITH_64BIT_ADDITIONS
+        $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) -print-file-name=libstdc++.a` $@ \
+             || $(CP_EXT) -f  `$(TOOL_$(VBOX_GCC_TOOL)_CXX) -print-file-name=libstdc++.a` $@
+else
         $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ \
              || $(CP_EXT) -f  `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@
+endif