FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c-incpath.c (add_standard_paths): Add both "translated" and non-translated header paths.

Browse source 
* c-incpath.c (add_standard_paths): Add both "translated" and
	non-translated header paths.

From-SVN: r64872
This commit is contained in:
Alan Modra 2003-03-25 23:23:23 +00:00 • committed by Alan Modra
parent e4e7d312cd
commit 611f07298c
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/ChangeLog
View file

@ -1,3 +1,8 @@
2003-03-26 Alan Modra <amodra@bigpond.net.au>
* c-incpath.c (add_standard_paths): Add both "translated" and
non-translated header paths.
2003-03-25 Loren James Rittle <ljrittle@acm.org>
* doc/install.texi (*-*-freebsd*): Update with known status.

31
gcc/c-incpath.c
View file

@ -127,10 +127,30 @@ add_standard_paths (sysroot, iprefix, cxx_stdinc)
int cxx_stdinc;
{
const struct default_include *p;
size_t len = 0;
size_t len;
if (iprefix)
len = cpp_GCC_INCLUDE_DIR_len;
if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0)
{
/* Look for directories that start with the standard prefix.
"Translate" them, ie. replace /usr/local/lib/gcc... with
IPREFIX and search them first. */
for (p = cpp_include_defaults; p->fname; p++)
{
if (!p->cplusplus || cxx_stdinc)
{
/* Should we be translating sysrooted dirs too? Assume
that iprefix and sysroot are mutually exclusive, for
now. */
if (sysroot && p->add_sysroot)
continue;
if (!strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
{
char *str = concat (iprefix, p->fname + len, NULL);
add_path (str, SYSTEM, p->cxx_aware);
}
}
}
}
for (p = cpp_include_defaults; p->fname; p++)
{
@ -141,11 +161,6 @@ add_standard_paths (sysroot, iprefix, cxx_stdinc)
/* Should this directory start with the sysroot? */
if (sysroot && p->add_sysroot)
str = concat (sysroot, p->fname, NULL);
/* Does this directory start with the prefix? If so, search
"translated" versions of GNU directories. These have
/usr/local/lib/gcc... replaced by iprefix. */
else if (len && !strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
str = concat (iprefix, p->fname + len, NULL);
else
str = update_path (p->fname, p->component);