From 7a3789e41d7634e5efd4b6159705946ebc47b614 Mon Sep 17 00:00:00 2001
From: Ivan Kuten <ivan.kuten@promwad.com>
Date: Tue, 8 Jan 2008 12:52:49 +0000
Subject: fix gcc 3.4.6 and libstdc++ when shared support is disabled, thanks
 Atle\!

---
 toolchain/gcc/3.4.6/300-libstdc++-pic.patch | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'toolchain/gcc')

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.
-- 
cgit v1.2.3