diff options
| author | Russ Cox <rsc@golang.org> | 2010-01-05 16:54:27 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-01-05 16:54:27 -0800 |
| commit | 32594bd43d90d344c04b91d69519529aafbbf4c8 (patch) | |
| tree | 328eb78f92043a15533048b3b8fe5feb9ffcc294 | |
| parent | 1c819cb194be25fa357ac478b07705f0aaa4c1bc (diff) | |
| download | go-32594bd43d90d344c04b91d69519529aafbbf4c8.tar.gz go-32594bd43d90d344c04b91d69519529aafbbf4c8.zip | |
rollback of https://golang.org/cl/181077
(broke build)
TBR=dho
https://golang.org/cl/181139
| -rw-r--r-- | src/Make.conf | 8 | ||||
| -rw-r--r-- | src/Make.pkg | 10 | ||||
| -rw-r--r-- | src/pkg/Makefile | 16 |
3 files changed, 18 insertions, 16 deletions
diff --git a/src/Make.conf b/src/Make.conf index fa7177aa83..a90ed0da4d 100644 --- a/src/Make.conf +++ b/src/Make.conf @@ -6,13 +6,17 @@ 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 -endif QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN)) +else +nullstring := +space := $(nullstring) # a space at the end +QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN)) +endif CC=$(QUOTED_GOBIN)/quietgcc LD=$(QUOTED_GOBIN)/quietgcc diff --git a/src/Make.pkg b/src/Make.pkg index d4196b6e84..b315b2ee1e 100644 --- a/src/Make.pkg +++ b/src/Make.pkg @@ -6,13 +6,17 @@ 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 -endif QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN)) +else +nullstring := +space := $(nullstring) # a space at the end +QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN)) +endif # GNU Make 3.80 has a bug in lastword # elem=$(lastword $(subst /, ,$(TARG))) @@ -26,6 +30,8 @@ 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 7d1e80d8db..f37502d58d 100644 --- a/src/pkg/Makefile +++ b/src/pkg/Makefile @@ -9,14 +9,6 @@ # # 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=\ @@ -143,16 +135,16 @@ nuke.dirs: $(addsuffix .nuke, $(DIRS)) test.dirs: $(addsuffix .test, $(TEST)) %.clean: - +cd $* && $(QUOTED_GOBIN)/gomake clean + +cd $* && gomake clean %.install: - +cd $* && $(QUOTED_GOBIN)/gomake install + +cd $* && gomake install %.nuke: - +cd $* && $(QUOTED_GOBIN)/gomake nuke + +cd $* && gomake nuke %.test: - +cd $* && $(QUOTED_GOBIN)/gomake test + +cd $* && gomake test clean: clean.dirs |