From 0fd212e1bd1d3039be765ac7344c23b7b14e3585 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Wed, 20 Dec 2006 22:34:14 +0000 Subject: [PATCH] re PR c/30242 (internal error in gcc break compilation) gcc/ 2006-12-20 Carlos O'Donell PR bootstrap/30242 * gcc/c-incpath.c (add_standard_paths): Only relocate paths that begin with the configured prefix. From-SVN: r120088 --- gcc/ChangeLog | 6 ++++++ gcc/c-incpath.c | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 797cecf7a7f3..42e4aa5edae4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-12-20 Carlos O'Donell + + PR bootstrap/30242 + * gcc/c-incpath.c (add_standard_paths): Only relocate paths that + begin with the configured prefix. + 2006-12-20 Jan Hubicka PR target/30213 diff --git a/gcc/c-incpath.c b/gcc/c-incpath.c index 2c5ac6db89f4..fe863d52b6e4 100644 --- a/gcc/c-incpath.c +++ b/gcc/c-incpath.c @@ -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); -- 2.47.2