cc/gcc: fix C++ headers location
In case we build the C++ compiler, we have to tell gcc where to put the C++
headers, or else it will try to # put it in prefix/tuple/include, which we
make a symlink to sysroot/usr/include during the build, and that we delete
(the symlink!) after the build, but gcc will not look in sysroot/usr/inlcude
for C++ headers by default.
Implements a fix suggested by: Bryan Hundven <bryanhundven@gmail.com>
Reported-by: Anthony Foiani <anthony.foiani@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from a0924619112015bdaa81a0a2313d21ef38607bc2)
1 diff -durN gcc-4.4.0.orig/libmudflap/mf-hooks2.c gcc-4.4.0/libmudflap/mf-hooks2.c
3 diff -durN gcc-4.4.4.orig/libmudflap/mf-hooks2.c gcc-4.4.4/libmudflap/mf-hooks2.c
4 --- gcc-4.4.4.orig/libmudflap/mf-hooks2.c 2009-04-10 01:23:07.000000000 +0200
5 +++ gcc-4.4.4/libmudflap/mf-hooks2.c 2010-05-16 19:37:18.000000000 +0200
8 TRACE ("%s\n", __PRETTY_FUNCTION__);
9 MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
16 TRACE ("%s\n", __PRETTY_FUNCTION__);
17 MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
18 MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
19 - bcopy (src, dest, n);
20 + memmove (dest, src, n);
25 TRACE ("%s\n", __PRETTY_FUNCTION__);
26 MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
27 MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
28 - return bcmp (s1, s2, n);
29 + return n == 0 ? 0 : memcmp (s1, s2, n);
34 size_t n = strlen (s);
35 TRACE ("%s\n", __PRETTY_FUNCTION__);
36 MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
37 - return index (s, c);
38 + return strchr (s, c);
43 size_t n = strlen (s);
44 TRACE ("%s\n", __PRETTY_FUNCTION__);
45 MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
46 - return rindex (s, c);
47 + return strrchr (s, c);
50 /* XXX: stpcpy, memccpy */