patches/gcc/4.0.4/180-sdk-libstdc++-includes.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Sep 12 23:51:25 2010 +0200 (2010-09-12)
changeset 2123 ff2181adbd28
parent 1 eeea35fbf182
permissions -rw-r--r--
cc/gcc: disable complibs if not selected

Force gcc to not link with some companion libraries when
there are not needed (because selected-out).

There is no option to tell gcc *not* to build the Graphite and/or
LTO stuff. They *will* be built if gcc finds the suitable companion
libraries. If we do not provide them, but the host has them, then
gcc *will* find them, and link with them.

Consider the following:
- host has suitable PPL and CLooG (eg. Debian Squeeze)
- user wants to build gcc>=4.4
- user de-selects GRAPHITE
- gcc will find the hosts PPL and CLooG, and will use them
- the user moves the toolchain to an older host that does
not have them (eg. Debian Lenny)
- the toolchain fails, when it was properly setup not to

So, explicitly tell gcc *not* to use unneeded companion libs.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@1
     1
diff -urN gcc-4.0.0-100/libstdc++-v3/fragment.am gcc-4.0.0/libstdc++-v3/fragment.am
yann@1
     2
--- gcc-4.0.0-100/libstdc++-v3/fragment.am	2004-10-25 15:32:40.000000000 -0500
yann@1
     3
+++ gcc-4.0.0/libstdc++-v3/fragment.am	2005-04-28 21:48:43.000000000 -0500
yann@1
     4
@@ -18,5 +18,5 @@
yann@1
     5
 	$(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
yann@1
     6
 
yann@1
     7
 # -I/-D flags to pass when compiling.
yann@1
     8
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
yann@1
     9
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) -I$(toplevel_srcdir)/include
yann@1
    10
 
yann@1
    11
diff -urN gcc-4.0.0-100/libstdc++-v3/libmath/Makefile.am gcc-4.0.0/libstdc++-v3/libmath/Makefile.am
yann@1
    12
--- gcc-4.0.0-100/libstdc++-v3/libmath/Makefile.am	2003-08-27 16:29:42.000000000 -0500
yann@1
    13
+++ gcc-4.0.0/libstdc++-v3/libmath/Makefile.am	2005-04-28 21:48:43.000000000 -0500
yann@1
    14
@@ -32,7 +32,7 @@
yann@1
    15
 
yann@1
    16
 libmath_la_SOURCES = stubs.c
yann@1
    17
 
yann@1
    18
-AM_CPPFLAGS = $(CANADIAN_INCLUDES)
yann@1
    19
+AM_CPPFLAGS = $(CANADIAN_INCLUDES) -I$(toplevel_srcdir)/include
yann@1
    20
 
yann@1
    21
 # Only compiling "C" sources in this directory.
yann@1
    22
 LIBTOOL = @LIBTOOL@ --tag CC