qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 15:24:45 -07:00
Code Releases Activity

Fix missing explicit GOBIN in src/pkg/Makefile. Clean up creation of

Browse Source 
QUOTED_GOBIN. Re-take of 181077; fixes copy-pasta that broke build.

Fixes #468

R=rsc
CC=golang-dev
https://golang.org/cl/183125
This commit is contained in:
Devon H. O'Dell 2010-01-06 07:47:56 -08:00 committed by Russ Cox
parent 597e57f4d5
commit 2eb9171dfb
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Make.conf
View File

@ -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

10
src/Make.pkg
View File

@ -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)

16
src/pkg/Makefile
View File

@ -9,6 +9,14 @@
#
# to rebuild the dependency information in Make.deps.
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))
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