diff options
| author | Russ Cox <rsc@golang.org> | 2009-11-15 12:57:28 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-11-15 12:57:28 -0800 |
| commit | 30fa6ac07384d459b3a2bb2ba8c5d2361bead9b5 (patch) | |
| tree | ee24a11dbc20a48d75e3e28d6474c58191b1dfbb | |
| parent | 595328e8455c3af6e70f2e8f154a7ad908daf882 (diff) | |
| download | golang-30fa6ac07384d459b3a2bb2ba8c5d2361bead9b5.tar.gz | |
makefiles: use correct gcc order in case --as-needed is in use.
Suggested by eostapets.
Fixes issue 141.
R=r
http://codereview.appspot.com/155049
| -rw-r--r-- | src/Make.pkg | 2 | ||||
| -rw-r--r-- | src/libcgo/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Make.pkg b/src/Make.pkg index dc0e70f37..137779207 100644 --- a/src/Make.pkg +++ b/src/Make.pkg @@ -112,7 +112,7 @@ _CGO_LDFLAGS_darwin=-dynamiclib -Wl,-undefined,dynamic_lookup gcc $(_CGO_CFLAGS_$(GOARCH)) -fPIC -O2 -o $@ -c $(CGO_CFLAGS) $*.cgo4.c $(elem)_%.so: %.cgo4.o - gcc $(_CGO_CFLAGS_$(GOARCH)) $(_CGO_LDFLAGS_$(GOOS)) -o $@ $*.cgo4.o $(CGO_LDFLAGS) + gcc $(_CGO_CFLAGS_$(GOARCH)) -o $@ $*.cgo4.o $(CGO_LDFLAGS) $(_CGO_LDFLAGS_$(GOOS)) $(pkgdir)/$(dir)/$(elem)_%.so: $(elem)_%.so @test -d $(GOROOT)/pkg && mkdir -p $(pkgdir)/$(dir) diff --git a/src/libcgo/Makefile b/src/libcgo/Makefile index a32382350..0cd19fbba 100644 --- a/src/libcgo/Makefile +++ b/src/libcgo/Makefile @@ -24,7 +24,7 @@ LDFLAGS_darwin=-dynamiclib -Wl,-undefined,dynamic_lookup /usr/lib/libpthread.dyl gcc $(CFLAGS_$(GOARCH)) -O2 -fPIC -o $@ -c $*.S libcgo.so: $(OFILES) - gcc $(CFLAGS_$(GOARCH)) $(LDFLAGS_$(GOOS)) -o libcgo.so $(OFILES) + gcc $(CFLAGS_$(GOARCH)) -o libcgo.so $(OFILES) $(LDFLAGS_$(GOOS)) $(GOROOT)/pkg/$(GOOS)_$(GOARCH)/libcgo.so: libcgo.so cp libcgo.so $@ |