1From f82d0f1b47ea7ae0d20c00b4f29cfd694ab66a07 Mon Sep 17 00:00:00 2001 2From: David 'Digit' Turner <digit@google.com> 3Date: Tue, 21 Feb 2012 15:07:59 +0100 4Subject: Rename libstdc++.so to libgnustl_shared.so 5 6This patch ensure that the generated library is called libgnustl_shared.so 7instead of libstdc++.so.3 (or some similar number-versioned name). 8 9Change-Id: I63fb5be818115c6d0c7e96b937ba39f225b475cf 10--- 11 gcc-4.8/libstdc++-v3/src/Makefile.in | 5 ++++- 12 gcc-4.9/libstdc++-v3/src/Makefile.in | 5 ++++- 13 3 files changed, 12 insertions(+), 3 deletions(-) 14 15diff --git a/gcc-4.8/libstdc++-v3/src/Makefile.in b/gcc-4.8/libstdc++-v3/src/Makefile.in 16index 9721ebb..dd3d426 100644 17--- a/gcc-4.8/libstdc++-v3/src/Makefile.in 18+++ b/gcc-4.8/libstdc++-v3/src/Makefile.in 19@@ -336,7 +336,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) 20 SUBDIRS = c++98 c++11 21 22 # Cross compiler support. 23-toolexeclib_LTLIBRARIES = libstdc++.la 24+toolexeclib_LTLIBRARIES = libgnustl_shared.la 25 @GLIBCXX_LDBL_COMPAT_FALSE@ldbl_compat_sources = 26 @GLIBCXX_LDBL_COMPAT_TRUE@ldbl_compat_sources = compatibility-ldbl.cc 27 parallel_compat_sources = \ 28@@ -544,6 +544,9 @@ clean-toolexeclibLTLIBRARIES: 29 libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 30 $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 31 32+libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 33+ $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 34+ 35 mostlyclean-compile: 36 -rm -f *.$(OBJEXT) 37 38diff --git a/gcc-4.9/libstdc++-v3/src/Makefile.in b/gcc-4.9/libstdc++-v3/src/Makefile.in 39index cd3943b..ec04005 100644 40--- a/gcc-4.9/libstdc++-v3/src/Makefile.in 41+++ b/gcc-4.9/libstdc++-v3/src/Makefile.in 42@@ -343,7 +343,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) 43 SUBDIRS = c++98 c++11 44 45 # Cross compiler support. 46-toolexeclib_LTLIBRARIES = libstdc++.la 47+toolexeclib_LTLIBRARIES = libgnustl_shared.la 48 @GLIBCXX_LDBL_COMPAT_FALSE@ldbl_compat_sources = 49 @GLIBCXX_LDBL_COMPAT_TRUE@ldbl_compat_sources = compatibility-ldbl.cc 50 parallel_compat_sources = \ 51@@ -554,6 +554,9 @@ clean-toolexeclibLTLIBRARIES: 52 libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 53 $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 54 55+libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 56+ $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 57+ 58 mostlyclean-compile: 59 -rm -f *.$(OBJEXT) 60 61-- 621.9.1.423.g4596e3a 63 64