diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2018-07-08 13:53:42 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2018-07-08 13:53:42 +0000 |
| commit | 186e1755be6cdf59bff519ec9de17030341c58e8 (patch) | |
| tree | ff17b40940297c1bc56f64b8905217c452dd5f89 /lang | |
| parent | c3ceed9e710af2a248af707067b631b6b04f8e56 (diff) | |
| download | pkgsrc-186e1755be6cdf59bff519ec9de17030341c58e8.tar.gz | |
Move definition of $GO to version.mk.
We have some packages, like mongodb-tools, that cannot include go-package.mk
but need to call the go tool.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/go/go-package.mk | 7 | ||||
| -rw-r--r-- | lang/go/version.mk | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lang/go/go-package.mk b/lang/go/go-package.mk index 82b252e64d4..ec2a5525670 100644 --- a/lang/go/go-package.mk +++ b/lang/go/go-package.mk @@ -1,4 +1,4 @@ -# $NetBSD: go-package.mk,v 1.13 2018/07/08 12:55:00 bsiegert Exp $ +# $NetBSD: go-package.mk,v 1.14 2018/07/08 13:53:42 bsiegert Exp $ # # This file implements common logic for compiling Go programs in pkgsrc. # @@ -51,11 +51,6 @@ .include "../../lang/go/version.mk" -# How to find the Go tool. -GOVERSSUFFIX?= -GO= ${PREFIX}/go${GOVERSSUFFIX}/bin/go - - _GO_DIST_BASE!= basename ${GO_SRCPATH} GO_DIST_BASE?= ${_GO_DIST_BASE} GO_BUILD_PATTERN?= ${GO_SRCPATH}/... diff --git a/lang/go/version.mk b/lang/go/version.mk index 6e7ee0a25b6..e5bc1e8c5e0 100644 --- a/lang/go/version.mk +++ b/lang/go/version.mk @@ -1,4 +1,4 @@ -# $NetBSD: version.mk,v 1.38 2018/06/12 17:37:59 bsiegert Exp $ +# $NetBSD: version.mk,v 1.39 2018/07/08 13:53:42 bsiegert Exp $ SSP_SUPPORTED= no @@ -7,6 +7,10 @@ SSP_SUPPORTED= no GO_VERSION= 1.10.3 GO14_VERSION= 1.4.3 +# How to find the Go tool +GOVERSSUFFIX?= +GO= ${PREFIX}/go${GOVERSSUFFIX}/bin/go + ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-earmv[67]hf NOT_FOR_PLATFORM= SunOS-*-i386 .if ${MACHINE_ARCH} == "i386" |