aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2012-02-21 15:07:59 +0100
committerDan Albert <danalbert@google.com>2015-08-27 15:51:57 -0700
commita4e5986f823cf7b71bce508361865abe24a43dfd (patch)
tree64f7fdfd213d1cc621eedb43300fe3b1dae48e28
parent6c24204f433ea9a5d6e04f13b9f5aa3653814157 (diff)
downloadtoolchain_gcc-a4e5986f823cf7b71bce508361865abe24a43dfd.tar.gz
toolchain_gcc-a4e5986f823cf7b71bce508361865abe24a43dfd.tar.bz2
toolchain_gcc-a4e5986f823cf7b71bce508361865abe24a43dfd.zip
Rename libstdc++.so to libgnustl_shared.so
This patch ensure that the generated library is called libgnustl_shared.so instead of libstdc++.so.3 (or some similar number-versioned name). Change-Id: I63fb5be818115c6d0c7e96b937ba39f225b475cf (cherry picked from commit 62268d3b73073a061628595f226989bc17c2c622)
-rw-r--r--gcc-4.8/libstdc++-v3/src/Makefile.in5
-rw-r--r--gcc-4.9/libstdc++-v3/src/Makefile.in5
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc-4.8/libstdc++-v3/src/Makefile.in b/gcc-4.8/libstdc++-v3/src/Makefile.in
index 9721ebb9b..dd3d42628 100644
--- a/gcc-4.8/libstdc++-v3/src/Makefile.in
+++ b/gcc-4.8/libstdc++-v3/src/Makefile.in
@@ -336,7 +336,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
SUBDIRS = c++98 c++11
# Cross compiler support.
-toolexeclib_LTLIBRARIES = libstdc++.la
+toolexeclib_LTLIBRARIES = libgnustl_shared.la
@GLIBCXX_LDBL_COMPAT_FALSE@ldbl_compat_sources =
@GLIBCXX_LDBL_COMPAT_TRUE@ldbl_compat_sources = compatibility-ldbl.cc
parallel_compat_sources = \
@@ -544,6 +544,9 @@ clean-toolexeclibLTLIBRARIES:
libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
$(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
+libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
+ $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
+
mostlyclean-compile:
-rm -f *.$(OBJEXT)
diff --git a/gcc-4.9/libstdc++-v3/src/Makefile.in b/gcc-4.9/libstdc++-v3/src/Makefile.in
index 7ddd55ad7..8bac916a3 100644
--- a/gcc-4.9/libstdc++-v3/src/Makefile.in
+++ b/gcc-4.9/libstdc++-v3/src/Makefile.in
@@ -343,7 +343,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
SUBDIRS = c++98 c++11
# Cross compiler support.
-toolexeclib_LTLIBRARIES = libstdc++.la
+toolexeclib_LTLIBRARIES = libgnustl_shared.la
@GLIBCXX_LDBL_COMPAT_FALSE@ldbl_compat_sources =
@GLIBCXX_LDBL_COMPAT_TRUE@ldbl_compat_sources = compatibility-ldbl.cc
parallel_compat_sources = \
@@ -554,6 +554,9 @@ clean-toolexeclibLTLIBRARIES:
libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
$(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
+libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
+ $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
+
mostlyclean-compile:
-rm -f *.$(OBJEXT)