diff options
| author | Devon H. O'Dell <devon.odell@gmail.com> | 2010-01-05 16:22:40 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-01-05 16:22:40 -0800 |
| commit | e032ab9dc86877978064846f67ef4f1537912eda (patch) | |
| tree | 731fb3803759bf8f1e3318c9ce9b018d20e24d78 | |
| parent | 10cdec9262d959b40022749f7a90460f717cc11e (diff) | |
| download | go-e032ab9dc86877978064846f67ef4f1537912eda.tar.gz go-e032ab9dc86877978064846f67ef4f1537912eda.zip | |
Fix missing explicit GOBIN in src/pkg/Makefile. Clean up creation of QUOTED_GOBIN
Fixes #468
R=rsc
CC=golang-dev
https://golang.org/cl/181077
| -rw-r--r-- | src/Make.conf | 8 | ||||
| -rw-r--r-- | src/Make.pkg | 10 | ||||
| -rw-r--r-- | src/pkg/Makefile | 16 |
3 files changed, 16 insertions, 18 deletions
diff --git a/src/Make.conf b/src/Make.conf index a90ed0da4d..fa7177aa83 100644 --- a/src/Make.conf +++ b/src/Make.conf @@ -6,17 +6,13 @@ CFLAGS=-ggdb -I"$(GOROOT)"/include -O2 -fno-inline O=o YFLAGS=-d # GNU Make syntax: -ifndef GOBIN nullstring := space := $(nullstring) # a space at the end +ifndef GOBIN QUOTED_HOME=$(subst $(space),\ ,$(HOME)) GOBIN=$(QUOTED_HOME)/bin -QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN)) -else -nullstring := -space := $(nullstring) # a space at the end -QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN)) endif +QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN)) CC=$(QUOTED_GOBIN)/quietgcc LD=$(QUOTED_GOBIN)/quietgcc diff --git a/src/Make.pkg b/src/Make.pkg index b315b2ee1e..d4196b6e84 100644 --- a/src/Make.pkg +++ b/src/Make.pkg @@ -6,17 +6,13 @@ all: package package: _obj/$(TARG).a testpackage: _test/$(TARG).a -ifndef GOBIN nullstring := space := $(nullstring) # a space at the end +ifndef GOBIN QUOTED_HOME=$(subst $(space),\ ,$(HOME)) GOBIN=$(QUOTED_HOME)/bin -QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN)) -else -nullstring := -space := $(nullstring) # a space at the end -QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN)) endif +QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN)) # GNU Make 3.80 has a bug in lastword # elem=$(lastword $(subst /, ,$(TARG))) @@ -30,8 +26,6 @@ dir=$(patsubst %/$(elem),%,$(TARG)) endif # ugly hack to deal with whitespaces in $GOROOT -nullstring := -space := $(nullstring) # a space at the end QUOTED_GOROOT=$(subst $(space),\ ,$(GOROOT)) pkgdir=$(QUOTED_GOROOT)/pkg/$(GOOS)_$(GOARCH) diff --git a/src/pkg/Makefile b/src/pkg/Makefile index f37502d58d..7d1e80d8db 100644 --- a/src/pkg/Makefile +++ b/src/pkg/Makefile @@ -9,6 +9,14 @@ # # to rebuild the dependency information in Make.deps. +nullstring := +space := $(nullstring) +ifndef GOBIN +QUOTED_HOME=$(subst $(space),\ ,$(HOME)) +GOBIN=$(QUOTED_HOME)/bin +endif +QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN)) + all: install DIRS=\ @@ -135,16 +143,16 @@ nuke.dirs: $(addsuffix .nuke, $(DIRS)) test.dirs: $(addsuffix .test, $(TEST)) %.clean: - +cd $* && gomake clean + +cd $* && $(QUOTED_GOBIN)/gomake clean %.install: - +cd $* && gomake install + +cd $* && $(QUOTED_GOBIN)/gomake install %.nuke: - +cd $* && gomake nuke + +cd $* && $(QUOTED_GOBIN)/gomake nuke %.test: - +cd $* && gomake test + +cd $* && $(QUOTED_GOBIN)/gomake test clean: clean.dirs |