Commit 0fd212e1 by Carlos O'Donell Committed by Carlos O'Donell

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

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
parent 2502ff19
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> 2006-12-20 Jan Hubicka <jh@suse.cz>
PR target/30213 PR target/30213
......
...@@ -164,13 +164,12 @@ add_standard_paths (const char *sysroot, const char *iprefix, ...@@ -164,13 +164,12 @@ add_standard_paths (const char *sysroot, const char *iprefix,
/* Should this directory start with the sysroot? */ /* Should this directory start with the sysroot? */
if (sysroot && p->add_sysroot) if (sysroot && p->add_sysroot)
str = concat (sysroot, p->fname, NULL); 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 /* If the compiler is relocated, and this is a configured
prefix relative path, then we use gcc_exec_prefix instead prefix relative path, then we use gcc_exec_prefix instead
of the configured prefix. */ of the configured prefix. */
gcc_assert (strncmp (p->fname, cpp_PREFIX,
cpp_PREFIX_len) == 0);
str = concat (gcc_exec_prefix, p->fname str = concat (gcc_exec_prefix, p->fname
+ cpp_PREFIX_len, NULL); + cpp_PREFIX_len, NULL);
str = update_path (str, p->component); str = update_path (str, p->component);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment