mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-21 14:30:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c/30242 (internal error in gcc break compilation)

Browse Source 
gcc/

2006-12-20  Carlos O'Donell  <carlos@codesourcery.com>

	PR bootstrap/30242
	* gcc/c-incpath.c (add_standard_paths): Only relocate paths that 
	begin with the configured prefix.

From-SVN: r120088
This commit is contained in:
Carlos O'Donell 2006-12-20 22:34:14 +00:00 committed by Carlos O'Donell
parent 2502ff194e
commit 0fd212e1bd
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2006-12-20 Carlos O'Donell <carlos@codesourcery.com>
PR bootstrap/30242
* gcc/c-incpath.c (add_standard_paths): Only relocate paths that
begin with the configured prefix.
2006-12-20 Jan Hubicka <jh@suse.cz>
PR target/30213

5
gcc/c-incpath.c
View File

@ -164,13 +164,12 @@ add_standard_paths (const char *sysroot, const char *iprefix,
/* Should this directory start with the sysroot? */
if (sysroot && p->add_sysroot)
str = concat (sysroot, p->fname, NULL);
else if (!p->add_sysroot && relocated)
else if (!p->add_sysroot && relocated
&& strncmp (p->fname, cpp_PREFIX, cpp_PREFIX_len) == 0)
{
/* If the compiler is relocated, and this is a configured
prefix relative path, then we use gcc_exec_prefix instead
of the configured prefix. */
gcc_assert (strncmp (p->fname, cpp_PREFIX,
cpp_PREFIX_len) == 0);
str = concat (gcc_exec_prefix, p->fname
+ cpp_PREFIX_len, NULL);
str = update_path (str, p->component);