summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorSergio Luis O. B. Correia <sergio@larces.uece.br>2009-11-23 17:32:51 -0800
committerSergio Luis O. B. Correia <sergio@larces.uece.br>2009-11-23 17:32:51 -0800
commita3d65354b47d85f8316f1011597b3935bead2a7b (patch)
treeb739091738e77c3d0fdbd27f77d22ed0e281dc32 /misc
parent722bfe36428db141c167450fe50d6d0e18d59039 (diff)
downloadgo-a3d65354b47d85f8316f1011597b3935bead2a7b.tar.gz
go: makes it build for the case $GOROOT has whitespaces
the bash scripts and makefiles for building go didn't take into account the fact $GOROOT / $GOBIN could both be directories containing whitespaces, and was not possible to build it in such a situation. this commit adjusts the various makefiles/scripts to make it aware of that possibility, and now it builds successfully when using a path with whitespaces as well. Fixes issue 115. R=rsc, dsymonds1 http://codereview.appspot.com/157067 Committer: Russ Cox <rsc@golang.org>
Diffstat (limited to 'misc')
-rw-r--r--misc/cgo/gmp/Makefile4
-rw-r--r--misc/cgo/stdio/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/misc/cgo/gmp/Makefile b/misc/cgo/gmp/Makefile
index c92458c90..ad5db33c2 100644
--- a/misc/cgo/gmp/Makefile
+++ b/misc/cgo/gmp/Makefile
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../src/Make.$(GOARCH)
TARG=gmp
@@ -22,7 +22,7 @@ CGO_LDFLAGS=-lgmp
CLEANFILES+=pi fib
-include $(GOROOT)/src/Make.pkg
+include ../../../src/Make.pkg
# Simple test programs
diff --git a/misc/cgo/stdio/Makefile b/misc/cgo/stdio/Makefile
index 83b1ed9e5..7ff8c3007 100644
--- a/misc/cgo/stdio/Makefile
+++ b/misc/cgo/stdio/Makefile
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../src/Make.$(GOARCH)
TARG=stdio
CGOFILES=\
@@ -10,7 +10,7 @@ CGOFILES=\
CLEANFILES+=hello fib chain run.out
-include $(GOROOT)/src/Make.pkg
+include ../../../src/Make.pkg
%: install %.go
$(GC) $*.go