Commit bc0469da authored by Ian Lance Taylor's avatar Ian Lance Taylor

Make.pkg: Always define _CGO_CFLAGS and friends.

Submitting TBR to fix Darwin build.

TBR=rsc
CC=golang-dev
https://golang.org/cl/4273096
parent f91b37b9
...@@ -117,16 +117,6 @@ dir: ...@@ -117,16 +117,6 @@ dir:
# _obj/x.cgo2.c - C implementations compiled with gcc to create a dynamic library # _obj/x.cgo2.c - C implementations compiled with gcc to create a dynamic library
# #
ifneq ($(CGOFILES)$(SWIGFILES),)
# Have to run gcc with the right size argument on hybrid 32/64 machines.
_CGO_CFLAGS_386=-m32
_CGO_CFLAGS_amd64=-m64
_CGO_LDFLAGS_freebsd=-shared -lpthread -lm
_CGO_LDFLAGS_linux=-shared -lpthread -lm
_CGO_LDFLAGS_darwin=-dynamiclib -Wl,-undefined,dynamic_lookup
_CGO_LDFLAGS_windows=-shared -lm -mthreads
endif
ifdef CGOFILES ifdef CGOFILES
_obj/_cgo_run: $(CGOFILES) _obj/_cgo_run: $(CGOFILES)
@mkdir -p _obj @mkdir -p _obj
...@@ -176,6 +166,14 @@ _obj/_cgo_import.c: _cgo1_.o ...@@ -176,6 +166,14 @@ _obj/_cgo_import.c: _cgo1_.o
# added _cgo_defun.$O to $OFILES, and added the installed copy of # added _cgo_defun.$O to $OFILES, and added the installed copy of
# package_x.so (built from x.cgo2.c) to $(INSTALLFILES). # package_x.so (built from x.cgo2.c) to $(INSTALLFILES).
# Have to run gcc with the right size argument on hybrid 32/64 machines.
_CGO_CFLAGS_386=-m32
_CGO_CFLAGS_amd64=-m64
_CGO_LDFLAGS_freebsd=-shared -lpthread -lm
_CGO_LDFLAGS_linux=-shared -lpthread -lm
_CGO_LDFLAGS_darwin=-dynamiclib -Wl,-undefined,dynamic_lookup
_CGO_LDFLAGS_windows=-shared -lm -mthreads
# Have to compile the runtime header. # Have to compile the runtime header.
RUNTIME_CFLAGS=-I$(pkgdir) RUNTIME_CFLAGS=-I$(pkgdir)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment