diff options
| author | Russ Cox <rsc@golang.org> | 2010-01-26 16:12:50 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-01-26 16:12:50 -0800 |
| commit | f8ca1ea471f45ec9971fc69f92360afb261d27ba (patch) | |
| tree | 33eb9b71f82bdfd72e295af477def0881f858964 /src | |
| parent | 0aca4e2791114e23c926b22638f66c4423c4e627 (diff) | |
| download | golang-f8ca1ea471f45ec9971fc69f92360afb261d27ba.tar.gz | |
gc: do not treat .6 different from .a anymore
R=ken2
CC=golang-dev
http://codereview.appspot.com/195050
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/gc/lex.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/cmd/gc/lex.c b/src/cmd/gc/lex.c index 7e2896822..8d67b8b2d 100644 --- a/src/cmd/gc/lex.c +++ b/src/cmd/gc/lex.c @@ -279,7 +279,7 @@ void importfile(Val *f, int line) { Biobuf *imp; - char *file, *p; + char *file; int32 c; int len; Strlit *path; @@ -301,9 +301,6 @@ importfile(Val *f, int line) return; } - if(!findpkg(f->u.sval)) - fatal("can't find import: %Z", f->u.sval); - path = f->u.sval; if(islocalname(path)) { snprint(cleanbuf, sizeof cleanbuf, "%s/%s", pathname, path->s); @@ -311,6 +308,9 @@ importfile(Val *f, int line) path = strlit(cleanbuf); } + if(!findpkg(path)) + fatal("can't find import: %Z", f->u.sval); + importpkg = mkpkg(path); imp = Bopen(namebuf, OREAD); @@ -322,17 +322,12 @@ importfile(Val *f, int line) if(len > 2 && namebuf[len-2] == '.' && namebuf[len-1] == 'a') { if(!skiptopkgdef(imp)) fatal("import not package file: %s", namebuf); - - // assume .a files move (get installed) - // so don't record the full path. - p = file + len - f->u.sval->len - 2; - linehist(p, -1, 1); // acts as #pragma lib - } else { - // assume .6 files don't move around - // so do record the full path - linehist(file, -1, 0); } + // assume files move (get installed) + // so don't record the full path. + linehist(file + len - path->len - 2, -1, 1); // acts as #pragma lib + /* * position the input right * after $$ and return |