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

rollback of https://golang.org/cl/181077

Browse Source 
(broke build)

TBR=dho
https://golang.org/cl/181139
This commit is contained in:
Russ Cox 2010-01-05 16:54:27 -08:00
parent 1c819cb194
commit 32594bd43d
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Make.conf
View File

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

10
src/Make.pkg
View File

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

16
src/pkg/Makefile
View File

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