build: fix spaces in GOROOT

Fixes #1413.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/4007041

diff --git a/src/Make.pkg b/src/Make.pkg
index 41124c828a69e8512a4269fb145fb251f74df3b2..850e86e35263b06db0aa753d05358dad150ec16d 100644 (file)
--- a/src/Make.pkg
+++ b/src/Make.pkg
@@ -167,7 +167,7 @@ _CGO_LDFLAGS_darwin=-dynamiclib -Wl,-undefined,dynamic_lookup
 _CGO_LDFLAGS_windows=-shared -lm -mthreads
 
 # Have to compile the runtime header.
-RUNTIME_CFLAGS=-I"$(pkgdir)"
+RUNTIME_CFLAGS=-I$(pkgdir)
 
 # Compile _cgo_defun.c with 6c; needs access to the runtime headers.
 _cgo_defun.$O: _cgo_defun.c

diff --git a/src/pkg/runtime/Makefile b/src/pkg/runtime/Makefile
index 3a2d3139763e28ad0b3baea675832f3d30a69605..521c095b995ebd2a4aa36d948b296262bc4d27f9 100644 (file)
--- a/src/pkg/runtime/Makefile
+++ b/src/pkg/runtime/Makefile
@@ -111,7 +111,7 @@ include ../../Make.pkg
 
 $(pkgdir)/%.h: %.h
        @test -d $(QUOTED_GOROOT)/pkg && mkdir -p $(pkgdir)
-       cp $< $@
+       cp $< "$@"
 
 clean: clean-local
 
@@ -138,7 +138,7 @@ version_$(GOOS).go:
        (echo 'package runtime'; echo 'const theGoos = "$(GOOS)"') >$@
 
 %.c:   %.goc goc2c
-       ./goc2c `pwd`/$< > $@.tmp
+       ./goc2c "`pwd`/$<" > $@.tmp
        mv -f $@.tmp $@
 
 %.$O:  $(GOARCH)/%.c