Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Apr 2019 16:25:58 +0000 (UTC)
From:      Julien Laffaye <jlaffaye@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r499862 - head/Mk/Uses
Message-ID:  <201904241625.x3OGPwZF040807@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jlaffaye
Date: Wed Apr 24 16:25:57 2019
New Revision: 499862
URL: https://svnweb.freebsd.org/changeset/ports/499862

Log:
  Improve support for ARM in go.mk
  - Set GOARM value according to current ARCH
  - Set CGO_ENABLED
  
  Submitted by:	Dmitri Goutnik <dg@syrec.org>
  Differential Revision:	D19892

Modified:
  head/Mk/Uses/go.mk

Modified: head/Mk/Uses/go.mk
==============================================================================
--- head/Mk/Uses/go.mk	Wed Apr 24 16:17:29 2019	(r499861)
+++ head/Mk/Uses/go.mk	Wed Apr 24 16:25:57 2019	(r499862)
@@ -55,15 +55,21 @@ GO_PKGNAME=	${PORTNAME}
 .endif
 GO_TARGET?=	${GO_PKGNAME}
 GO_BUILDFLAGS+=	-v -buildmode=exe
+CGO_ENABLED?=	1
 CGO_CFLAGS+=	-I${LOCALBASE}/include
 CGO_LDFLAGS+=	-L${LOCALBASE}/lib
+.if ${ARCH} == armv6 || ${ARCH} == armv7
+GOARM?=		${ARCH:C/armv//}
+.endif
 
 # Read-only variables
 GO_CMD=		${LOCALBASE}/bin/go
 GO_WRKDIR_BIN=	${WRKDIR}/bin
 
-GO_ENV+=	CGO_CFLAGS="${CGO_CFLAGS}" \
-		CGO_LDFLAGS="${CGO_LDFLAGS}"
+GO_ENV+=	CGO_ENABLED=${CGO_ENABLED} \
+		CGO_CFLAGS="${CGO_CFLAGS}" \
+		CGO_LDFLAGS="${CGO_LDFLAGS}" \
+		GOARM=${GOARM}
 
 .if ${go_ARGS:Mmodules}
 GO_BUILDFLAGS+=	-mod=vendor



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904241625.x3OGPwZF040807>