From 9d18f04a7c12f1dfe9d698fd17c36c930c9b742a Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 25 May 2014 16:50:52 -0400 Subject: Corrected the environment in windowsconstgen.go so that we can run it from test.sh. Phew! --- tools/windowsconstgen.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'tools/windowsconstgen.go') diff --git a/tools/windowsconstgen.go b/tools/windowsconstgen.go index 448b549..0617eb1 100644 --- a/tools/windowsconstgen.go +++ b/tools/windowsconstgen.go @@ -182,7 +182,16 @@ func main() { defer f.Close() cmd.Stdout = f cmd.Stderr = os.Stderr - cmd.Env = append(cmd.Env, os.Environ()...) // otherwise $PATH doesn't get carried over and things mysteriously fail + // we need to preserve the environment EXCEPT FOR the variables we're overriding + // thanks to raggi and smw in irc.freenode.net/#go-nuts + for _, ev := range os.Environ() { + if strings.HasPrefix(ev, "GOOS=") || + strings.HasPrefix(ev, "GOARCH=") || + strings.HasPrefix(ev, "CGO_ENABLED=") { + continue + } + cmd.Env = append(cmd.Env, ev) + } cmd.Env = append(cmd.Env, "GOOS=windows", "GOARCH=" + targetarch, -- cgit v1.2.3