diff options
| author | Russ Cox <rsc@golang.org> | 2015-01-19 11:33:46 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-01-21 00:44:50 +0000 |
| commit | c4dd7fac89a845d4c9e5e9f1e079d9d7013269de (patch) | |
| tree | eb182480048f5810a2e8f8593f476a25c5402616 /src | |
| parent | 3b2de80309d6a788d33304c1ac9af289a74501e8 (diff) | |
| download | go-c4dd7fac89a845d4c9e5e9f1e079d9d7013269de.tar.xz | |
[dev.cc] cmd/dist, lib9: make GOHOSTARCH, GOHOSTOS available to C programs
Needed for invoking a Go subprocess in the C code.
The Go tools live in $GOROOT/pkg/tool/$GOHOSTARCH_$GOHOSTOS.
Change-Id: I961b6b8a07de912de174b758b2fb87d77080546d
Reviewed-on: https://go-review.googlesource.com/3042
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/dist/build.go | 2 | ||||
| -rw-r--r-- | src/lib9/goos.c | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go index 9e4d1e3c22..366612cdd1 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -929,6 +929,8 @@ func install(dir string) { compile = append(compile, "-D", fmt.Sprintf("GOOS=%q", goos), "-D", fmt.Sprintf("GOARCH=%q", goarch), + "-D", fmt.Sprintf("GOHOSTOS=%q", gohostos), + "-D", fmt.Sprintf("GOHOSTARCH=%q", gohostarch), "-D", fmt.Sprintf("GOROOT=%q", goroot_final), "-D", fmt.Sprintf("GOVERSION=%q", goversion), "-D", fmt.Sprintf("GOARM=%q", goarm), diff --git a/src/lib9/goos.c b/src/lib9/goos.c index 2d4a800dd1..68b94d6114 100644 --- a/src/lib9/goos.c +++ b/src/lib9/goos.c @@ -52,8 +52,20 @@ getgo386(void) return defgetenv("GO386", GO386); } -char * +char* getgoextlinkenabled(void) { return GO_EXTLINK_ENABLED; } + +char* +getgohostarch(void) +{ + return GOHOSTARCH; +} + +char* +getgohostos(void) +{ + return GOHOSTOS; +} |