summaryrefslogtreecommitdiffstats
path: root/toolchain/gcc/3.4.6
diff options
context:
space:
mode:
authorIvan Kuten <ivan.kuten@promwad.com>2008-01-08 12:52:49 +0000
committerIvan Kuten <ivan.kuten@promwad.com>2008-01-08 12:52:49 +0000
commit7a3789e41d7634e5efd4b6159705946ebc47b614 (patch)
tree13fc841cac43efd6f315cbc8d82c1b3ec64c9a34 /toolchain/gcc/3.4.6
parent1388c9ab034203ddd4b6784d21b4ac77d7a2ec1b (diff)
downloadbuildroot-novena-7a3789e41d7634e5efd4b6159705946ebc47b614.tar.gz
buildroot-novena-7a3789e41d7634e5efd4b6159705946ebc47b614.zip
fix gcc 3.4.6 and libstdc++ when shared support is disabled, thanks Atle\!
Diffstat (limited to 'toolchain/gcc/3.4.6')
-rw-r--r--toolchain/gcc/3.4.6/300-libstdc++-pic.patch24
1 files changed, 14 insertions, 10 deletions
diff --git a/toolchain/gcc/3.4.6/300-libstdc++-pic.patch b/toolchain/gcc/3.4.6/300-libstdc++-pic.patch
index 9f304a4c4..e8c9ed415 100644
--- a/toolchain/gcc/3.4.6/300-libstdc++-pic.patch
+++ b/toolchain/gcc/3.4.6/300-libstdc++-pic.patch
@@ -2,21 +2,23 @@
--- gcc/libstdc++-v3/src/Makefile.am
+++ gcc/libstdc++-v3/src/Makefile.am
-@@ -224,6 +224,10 @@
- @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
-
+@@ -209,6 +209,11 @@
+ CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
+ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+install-exec-local:
++ifeq ($(enable_shared),yes)
+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+
++endif
+
# Added bits to build debug library.
- if GLIBCPP_BUILD_DEBUG
- all-local: build_debug
-
+ if GLIBCXX_BUILD_DEBUG
--- gcc/libstdc++-v3/src/Makefile.in
+++ gcc/libstdc++-v3/src/Makefile.in
-@@ -585,7 +585,7 @@
+--- gcc-3.4.6/libstdc++-v3/src/Makefile.in 2004-04-16 21:08:35.000000000 +0200
++++ gcc-3.4.6-patched/libstdc++-v3/src/Makefile.in 2007-11-30 13:33:26.000000000 +0100
+@@ -592,7 +592,7 @@
install-data-am: install-data-local
@@ -25,7 +27,7 @@
install-info: install-info-am
-@@ -618,6 +618,7 @@
+@@ -625,6 +625,7 @@
distclean-tags distdir dvi dvi-am info info-am install \
install-am install-data install-data-am install-data-local \
install-exec install-exec-am install-info install-info-am \
@@ -33,14 +35,16 @@
install-man install-strip install-toolexeclibLTLIBRARIES \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
-@@ -707,6 +708,11 @@
+@@ -709,6 +710,13 @@
install_debug:
(cd ${debugdir} && $(MAKE) \
toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
+
+install-exec-local:
++ifeq ($(enable_shared),yes)
+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
++endif
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.