diff options
| author | Jeff Law <law@gcc.gnu.org> | 1998-04-04 06:32:39 -0700 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-04-04 06:32:39 -0700 |
| commit | e5e809f4194e578b5fbd48fc5a1df2377f28d197 (patch) | |
| tree | 6743f11e58bd7a933b08900d973d89026cd11c43 /gcc/prefix.c | |
| parent | 31031eddacda46a500b2390f52cd4474bcaf84ca (diff) | |
| download | gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.zip gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.tar.gz gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.tar.bz2 | |
* Check in merge from gcc2. See ChangeLog.11 and ChangeLog.12
for details.
* haifa-sched.c: Mirror recent changes from gcc2.
From-SVN: r18984
Diffstat (limited to 'gcc/prefix.c')
| -rw-r--r-- | gcc/prefix.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gcc/prefix.c b/gcc/prefix.c index c079447..1c96c58 100644 --- a/gcc/prefix.c +++ b/gcc/prefix.c @@ -240,7 +240,7 @@ translate_name (name) char *name; { char code = name[0]; - char *key, *prefix; + char *key, *prefix = 0; int keylen; if (code != '@' && code != '$') @@ -268,11 +268,10 @@ translate_name (name) prefix = std_prefix; } else - { - prefix = getenv (key); - if (prefix == 0) - prefix = concat ("$", key, NULL_PTR); - } + prefix = getenv (key); + + if (prefix == 0) + prefix = PREFIX; /* Remove any trailing directory separator from what we got. */ if (prefix[strlen (prefix) - 1] == '/' |