diff options
| author | grosser <grosser@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-11-29 16:30:38 +0000 |
|---|---|---|
| committer | grosser <grosser@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-11-29 16:30:38 +0000 |
| commit | 1827f8524f4d7df467ccce50bd0a848028567de4 (patch) | |
| tree | 5681b177cfba3f84cba714e229735745af184c37 /gcc/incpath.c | |
| parent | 81b952e7e1c97b5088241e38dbeb31abcfc1c3c8 (diff) | |
| download | gcc-1827f8524f4d7df467ccce50bd0a848028567de4.tar.gz | |
Merge from mainline (154493:154734)
2009-11-28 Tobias Grosser <grosser@fim.uni-passau.de>
* Merge from mainline (154493:154734).
* Fix last ChangeLog entry. We merged up to 154491, not 151806.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@154737 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/incpath.c')
| -rw-r--r-- | gcc/incpath.c | 10 |
1 files changed, 5 insertions, 5 deletions
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 |