Compile stdc++ library with both static and dynamic linking.
BUG=http://code.google.com/p/nativeclient/issues/detail?id=1580
TEST=compile glibc and check that libstdc++.so is present.

Review URL: http://codereview.chromium.org/6761001
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index a4a4fae..36767da 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -10170,7 +10170,7 @@
   ;;
 
 # 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
@@ -10266,7 +10266,9 @@
   # 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*)
@@ -14096,7 +14098,7 @@
   ;;
 
 # 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
@@ -14192,7 +14194,9 @@
   # 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*)
diff --git a/libtool.m4 b/libtool.m4
index c17514b..5f50db9 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -2445,7 +2445,7 @@
   ;;
 
 # 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
@@ -2487,7 +2487,9 @@
   # 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*)