From 04b08da9af0c450d645ab7389d1467308cfc2db8 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@debian.org>
Date: Mon, 4 Mar 2013 21:27:36 +0100
Subject: Imported Upstream version 1.1~hg20130304

---
 src/cmd/go/env.go | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/cmd/go/env.go')

diff --git a/src/cmd/go/env.go b/src/cmd/go/env.go
index d5b034809..6cab37b48 100644
--- a/src/cmd/go/env.go
+++ b/src/cmd/go/env.go
@@ -6,6 +6,7 @@ package main
 
 import (
 	"fmt"
+	"os"
 	"runtime"
 	"strings"
 )
@@ -33,16 +34,22 @@ func mkEnv() []envVar {
 	b.init()
 
 	env := []envVar{
-		{"GOROOT", goroot},
-		{"GOBIN", gobin},
 		{"GOARCH", goarch},
+		{"GOBIN", gobin},
 		{"GOCHAR", archChar},
-		{"GOOS", goos},
 		{"GOEXE", exeSuffix},
 		{"GOHOSTARCH", runtime.GOARCH},
 		{"GOHOSTOS", runtime.GOOS},
+		{"GOOS", goos},
+		{"GOPATH", os.Getenv("GOPATH")},
+		{"GOROOT", goroot},
 		{"GOTOOLDIR", toolDir},
-		{"GOGCCFLAGS", strings.Join(b.gccCmd(".")[3:], " ")},
+	}
+
+	if goos != "plan9" {
+		cmd := b.gccCmd(".")
+		env = append(env, envVar{"CC", cmd[0]})
+		env = append(env, envVar{"GOGCCFLAGS", strings.Join(cmd[3:], " ")})
 	}
 
 	if buildContext.CgoEnabled {
-- 
cgit v1.2.3