From: Joe Poirier Date: Sat, 23 Apr 2011 18:34:08 +0000 (-0700) Subject: rc/env.bash: fix for Go tool-chain build on windows under msys. X-Git-Tag: weekly.2011-04-27~50 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=057fa94d3160a31b29d7a3bde9727dd1df0e31e2;p=gostls13.git rc/env.bash: fix for Go tool-chain build on windows under msys. The path conversion is done automatically if msys' builtin shell commands are used. R=rsc1, peterGo, brainman, Mr_Dark, r CC=golang-dev https://golang.org/cl/4452042 --- diff --git a/src/env.bash b/src/env.bash index c1055d561b..ca3ecebe87 100644 --- a/src/env.bash +++ b/src/env.bash @@ -3,6 +3,16 @@ # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. +# If set to a Windows-style path convert to an MSYS-Unix +# one using the built-in shell commands. +if [[ "$GOROOT" == *:* ]]; then + GOROOT=$(cd "$GOROOT"; pwd) +fi + +if [[ "$GOBIN" == *:* ]]; then + GOBIN=$(cd "$GOBIN"; pwd) +fi + export GOROOT=${GOROOT:-$(cd ..; pwd)} if ! test -f "$GOROOT"/include/u.h