diff options
| author | Rob Pike <r@golang.org> | 2010-01-13 14:39:16 +1100 |
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2010-01-13 14:39:16 +1100 |
| commit | b006b3690903f289f7240153cefcb0077b3199f2 (patch) | |
| tree | 15394266413afc7dfd1ce8cc9d6b44e3e7b7b98f /src/cmd/ld | |
| parent | ee8e92b3022ed1204c7f18a961b61b5da3f9f772 (diff) | |
| download | golang-b006b3690903f289f7240153cefcb0077b3199f2.tar.gz | |
ignore $GOARCH inside the compiler and linker.
by definition, they know what they are building for.
makes it easier to switch architectures when testing.
% 6g x.go
% 6l x.6
% 6.out
"Wed Jan 13 10:57:46 EST 2010"
% 8g x.go
% 8l x.8
% 8.out
"Wed Jan 13 10:57:46 EST 2010"
% echo $GOARCH
%
R=rsc
CC=golang-dev
http://codereview.appspot.com/186116
Diffstat (limited to 'src/cmd/ld')
| -rw-r--r-- | src/cmd/ld/lib.c | 5 | ||||
| -rw-r--r-- | src/cmd/ld/lib.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/cmd/ld/lib.c b/src/cmd/ld/lib.c index 232916845..f702bae23 100644 --- a/src/cmd/ld/lib.c +++ b/src/cmd/ld/lib.c @@ -721,7 +721,6 @@ mywhatsys(void) char *s; goroot = getenv("GOROOT"); - goarch = getenv("GOARCH"); goos = getenv("GOOS"); if(goroot == nil) { @@ -732,9 +731,7 @@ mywhatsys(void) strcpy(goroot, s); strcat(goroot, "/go"); } - if(goarch == nil) { - goarch = "amd64"; - } + goarch = thestring; // ignore $GOARCH - we know who we are if(goos == nil) { goos = "linux"; } diff --git a/src/cmd/ld/lib.h b/src/cmd/ld/lib.h index 4a300ac4e..bf26ae87d 100644 --- a/src/cmd/ld/lib.h +++ b/src/cmd/ld/lib.h @@ -52,6 +52,7 @@ EXTERN uchar inuxi4[4]; EXTERN uchar inuxi8[8]; EXTERN char* outfile; EXTERN int32 nsymbol; +EXTERN char* thestring; void addlib(char *src, char *obj); void copyhistfrog(char *buf, int nbuf); |