aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Brainman <alex.brainman@gmail.com>2011-07-12 14:22:48 +1000
committerAlex Brainman <alex.brainman@gmail.com>2011-07-12 14:22:48 +1000
commit8ed9fc600c7dc6a9286a6f04bdb41694d53bac3c (patch)
tree205d0a13478b90bd598e35ebdf418fcd853ebc53 /src
parentce3c3953be1c179685a5d318fd85f9b8009f0fb2 (diff)
downloadgo-8ed9fc600c7dc6a9286a6f04bdb41694d53bac3c.tar.xz
6l: change default output name to 6.out.exe on windows
R=golang-dev, vcc.163 CC=golang-dev https://golang.org/cl/4670049
Diffstat (limited to 'src')
-rw-r--r--src/cmd/6l/obj.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/cmd/6l/obj.c b/src/cmd/6l/obj.c
index e3191bb4dc..71649473d2 100644
--- a/src/cmd/6l/obj.c
+++ b/src/cmd/6l/obj.c
@@ -84,7 +84,7 @@ main(int argc, char *argv[])
listinit();
memset(debug, 0, sizeof(debug));
nerrors = 0;
- outfile = "6.out";
+ outfile = nil;
HEADTYPE = -1;
INITTEXT = -1;
INITDAT = -1;
@@ -134,11 +134,20 @@ main(int argc, char *argv[])
if(argc != 1)
usage();
- libinit();
+ mywhatsys(); // get goos
if(HEADTYPE == -1)
HEADTYPE = headtype(goos);
+ if(outfile == nil) {
+ if(HEADTYPE == Hwindows)
+ outfile = "6.out.exe";
+ else
+ outfile = "6.out";
+ }
+
+ libinit();
+
switch(HEADTYPE) {
default:
diag("unknown -H option");