summaryrefslogtreecommitdiff
path: root/src/Make.cmd
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2010-08-24 20:00:33 -0400
committerRuss Cox <rsc@golang.org>2010-08-24 20:00:33 -0400
commitdcb6b277d7e6cc76451e9c12c3fa7d3227a7510c (patch)
treeebe80eb78031e7655219cef81feafdd2a6d43c21 /src/Make.cmd
parent245294d7b6cbc887554e424574ff36f88df42c00 (diff)
downloadgo-dcb6b277d7e6cc76451e9c12c3fa7d3227a7510c.tar.gz
build: $GOBIN defaults to $GOROOT/bin
R=r CC=golang-dev http://codereview.appspot.com/1982049
Diffstat (limited to 'src/Make.cmd')
-rw-r--r--src/Make.cmd9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/Make.cmd b/src/Make.cmd
index 134401093..73622f5a5 100644
--- a/src/Make.cmd
+++ b/src/Make.cmd
@@ -8,20 +8,15 @@ endif
all: $(TARG)
-# ugly hack to deal with whitespaces in $GOROOT
-nullstring :=
-space := $(nullstring) # a space at the end
-QUOTED_GOROOT:=$(subst $(space),\ ,$(GOROOT))
-
include $(QUOTED_GOROOT)/src/Make.common
PREREQ+=$(patsubst %,%.make,$(DEPS))
$(TARG): _go_.$O $(OFILES)
- $(QUOTED_GOBIN)/$(LD) -o $@ _go_.$O $(OFILES)
+ $(LD) -o $@ _go_.$O $(OFILES)
_go_.$O: $(GOFILES) $(PREREQ)
- $(QUOTED_GOBIN)/$(GC) -o $@ $(GOFILES)
+ $(GC) -o $@ $(GOFILES)
install: $(QUOTED_GOBIN)/$(TARG)