libstdc++-v3/configure

Index: libstdc++-v3/configure
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index a4a4fae664660c2d5e1b22ac1392777e19f13faf..564154264b58aec3049bfc341f1ea1fed3cf52bb 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -10170,11 +10170,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}'
+  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
@@ -10266,7 +10270,9 @@ fi
   # 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,11 +14102,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}'
+  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
@@ -14192,7 +14202,9 @@ fi
   # 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*)