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.2.1.orig/libmudflap/mf-hooks2.c gcc-4.2.1/libmudflap/mf-hooks2.c
2 --- gcc-4.2.1.orig/libmudflap/mf-hooks2.c 2005-09-23 23:58:39.000000000 +0200
3 +++ gcc-4.2.1/libmudflap/mf-hooks2.c 2007-08-03 20:35:09.000000000 +0200
6 TRACE ("%s\n", __PRETTY_FUNCTION__);
7 MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
14 TRACE ("%s\n", __PRETTY_FUNCTION__);
15 MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
16 MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
17 - bcopy (src, dest, n);
18 + memmove (dest, src, n);
23 TRACE ("%s\n", __PRETTY_FUNCTION__);
24 MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
25 MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
26 - return bcmp (s1, s2, n);
27 + return n == 0 ? 0 : memcmp (s1, s2, n);
32 size_t n = strlen (s);
33 TRACE ("%s\n", __PRETTY_FUNCTION__);
34 MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
35 - return index (s, c);
36 + return strchr (s, c);
41 size_t n = strlen (s);
42 TRACE ("%s\n", __PRETTY_FUNCTION__);
43 MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
44 - return rindex (s, c);
45 + return strrchr (s, c);
48 /* XXX: stpcpy, memccpy */