X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fincpath.c;fp=gcc%2Fincpath.c;h=9cc783f6132bb3cf8bee09c1b122c1ef3967d1e7;hb=48e1416a24d50cacbb2a5e06a9ee61dd8cbee313;hp=a5619781b105fdf4830f294efc3964e7a859234d;hpb=7f0f96af0499f0a9f8ee7198823d311f1a66ca9b;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/incpath.c b/gcc/incpath.c index a5619781b10..9cc783f6132 100644 --- a/gcc/incpath.c +++ b/gcc/incpath.c @@ -171,8 +171,8 @@ add_standard_paths (const char *sysroot, const char *iprefix, && strncmp (p->fname, cpp_PREFIX, cpp_PREFIX_len) == 0) { static const char *relocated_prefix; - /* If this path starts with the configure-time prefix, - but the compiler has been relocated, replace it + /* If this path starts with the configure-time prefix, + but the compiler has been relocated, replace it with the run-time prefix. The run-time exec prefix is GCC_EXEC_PREFIX. Compute the path from there back to the toplevel prefix. */ @@ -182,13 +182,13 @@ add_standard_paths (const char *sysroot, const char *iprefix, /* Make relative prefix expects the first argument to be a program, not a directory. */ dummy = concat (gcc_exec_prefix, "dummy", NULL); - relocated_prefix + relocated_prefix = make_relative_prefix (dummy, cpp_EXEC_PREFIX, cpp_PREFIX); } str = concat (relocated_prefix, - p->fname + cpp_PREFIX_len, + p->fname + cpp_PREFIX_len, NULL); str = update_path (str, p->component); } @@ -399,7 +399,7 @@ add_path (char *path, int chain, int cxx_aware, bool user_supplied_p) char* end = path + pathlen - 1; /* Preserve the lead '/' or lead "c:/". */ char* start = path + (pathlen > 2 && path[1] == ':' ? 3 : 1); - + for (; end > start && IS_DIR_SEPARATOR (*end); end--) *end = 0; #endif