diff options
| author | Kai Backman <kaib@golang.org> | 2010-02-03 22:31:38 -0800 |
|---|---|---|
| committer | Kai Backman <kaib@golang.org> | 2010-02-03 22:31:38 -0800 |
| commit | f3d2f3eb13763301d160f24a024ecd3250ceafd8 (patch) | |
| tree | 7df11cafd4d2bf11cabf9e9866d3abd0cd1de42f /src/cmd/6l/obj.c | |
| parent | 44ef2dd81d436072a9813451a58cf64e61bef2ad (diff) | |
| download | golang-f3d2f3eb13763301d160f24a024ecd3250ceafd8.tar.gz | |
search for runtime.a in the package path instead of hardcoding
the location. remove last remnants of broken -l flag.
R=rsc
CC=golang-dev
http://codereview.appspot.com/201042
Diffstat (limited to 'src/cmd/6l/obj.c')
| -rw-r--r-- | src/cmd/6l/obj.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/cmd/6l/obj.c b/src/cmd/6l/obj.c index edae1c618..537ef9e9a 100644 --- a/src/cmd/6l/obj.c +++ b/src/cmd/6l/obj.c @@ -100,7 +100,9 @@ main(int argc, char *argv[]) ARGBEGIN { default: c = ARGC(); - if(c >= 0 && c < sizeof(debug)) + if(c == 'l') + usage(); + if(c >= 0 && c < sizeof(debug)) debug[c]++; break; case 'o': /* output to (next arg) */ @@ -131,7 +133,6 @@ main(int argc, char *argv[]) break; case 'u': /* produce dynamically loadable module */ dlm = 1; - debug['l']++; if(argv[1] != nil && argv[1][0] != '-' && !isobjfile(argv[1])) readundefs(ARGF(), SIMPORT); break; @@ -347,9 +348,7 @@ main(int argc, char *argv[]) lastp = firstp; addlibpath("command line", "command line", argv[0], "main"); - - if(!debug['l']) - loadlib(); + loadlib(); deadcode(); |