diff options
| author | Russ Cox <rsc@golang.org> | 2009-12-17 17:28:22 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-12-17 17:28:22 -0800 |
| commit | 438ddd1a90fba7ea709ef67f04484707db91795b (patch) | |
| tree | 3ec1713bc7ea3aa13b1e0a6346ec9c8001331219 /src | |
| parent | cea8dfc030dd1ab0a36118975c1b17c895e017bf (diff) | |
| download | golang-438ddd1a90fba7ea709ef67f04484707db91795b.tar.gz | |
Make.pkg: fix cgo for TARG=a/b
R=dho, phf
CC=golang-dev
http://codereview.appspot.com/180082
Diffstat (limited to 'src')
| -rw-r--r-- | src/Make.pkg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Make.pkg b/src/Make.pkg index 489aa78c2..890f43d49 100644 --- a/src/Make.pkg +++ b/src/Make.pkg @@ -41,7 +41,7 @@ GOFILES+=$(patsubst %.go,%.cgo1.go,$(CGOFILES)) GOFILES+=_cgo_gotypes.go OFILES+=_cgo_defun.$O GCC_OFILES=$(patsubst %.go,%.cgo2.o,$(CGOFILES)) -INSTALLFILES+=$(pkgdir)/$(dir)/$(TARG).so +INSTALLFILES+=$(pkgdir)/$(TARG).so PREREQ+=$(patsubst %,%.make,$(DEPS)) endif @@ -148,7 +148,7 @@ _cgo_defun.$O: _cgo_defun.c _cgo_.so: $(GCC_OFILES) gcc $(_CGO_CFLAGS_$(GOARCH)) -o $@ $(GCC_OFILES) $(CGO_LDFLAGS) $(_CGO_LDFLAGS_$(GOOS)) -$(pkgdir)/$(dir)/$(TARG).so: _cgo_.so +$(pkgdir)/$(TARG).so: _cgo_.so @test -d $(QUOTED_GOROOT/pkg && mkdir -p $(pkgdir)/$(dir) cp _cgo_.so "$@" |