Compile stdc++ library with both static and dynamic linking.

libtool.m4

Index: libtool.m4
diff --git a/libtool.m4 b/libtool.m4
index c17514b9260afe669041728788e9e41eef9a71f0..6719c9085ce55120b13ea7a5742e981d2ce67977 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -2445,11 +2445,15 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+nacl* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  if [ $host_os == 'nacl' ] ; then
+    library_names_spec='${libname}${release}-${versuffix:1}${shared_ext} ${libname}${release}${shared_ext}$major $libname${shared_ext}'

[khim, 2011/03/28 14:42:11]

Let's not try to fix upstream inconsistencies.

We have enough our own ones.

[halyavin, 2011/03/28 14:50:13]

Done.

+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  fi
   soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2487,7 +2491,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   # most powerpc-linux boxes support dynamic linking these days and
   # people can always --disable-shared, the test was removed, and we
   # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
+  if [ $host_os != 'nacl' ] ; then
+    dynamic_linker='GNU/Linux ld.so'
+  fi
   ;;
 
 netbsd*)