svn commit: r374178 - in head: databases/gosqlite3 lang/go/files

[Baptiste Daroussin]

Author: bapt
Date: Sun Dec  7 09:25:00 2014
New Revision: 374178
URL: https://svnweb.freebsd.org/changeset/ports/374178
QAT: https://qat.redports.org/buildarchive/r374178/

Log:
  Fix build when compiler is clang

Modified:
  head/databases/gosqlite3/Makefile
  head/lang/go/files/bsd.go.mk

Modified: head/databases/gosqlite3/Makefile
==============================================================================
--- head/databases/gosqlite3/Makefile	Sun Dec  7 09:13:02 2014	(r374177)
+++ head/databases/gosqlite3/Makefile	Sun Dec  7 09:25:00 2014	(r374178)
@@ -10,10 +10,15 @@ MASTER_SITES=	LOCAL/jlaffaye
 MAINTAINER=	lichray at gmail.com
 COMMENT=	Go interface for SQLite3
 
+USES=		compiler
+
 LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
 GO_PKGNAME=	github.com/kuroneko/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/lang/go/files/bsd.go.mk"
+.if ${COMPILER_TYPE} == clang && ${CC} == cc
+CC=	clang
+.endif
 .include <bsd.port.post.mk>

Modified: head/lang/go/files/bsd.go.mk
==============================================================================
--- head/lang/go/files/bsd.go.mk	Sun Dec  7 09:13:02 2014	(r374177)
+++ head/lang/go/files/bsd.go.mk	Sun Dec  7 09:25:00 2014	(r374178)
@@ -44,7 +44,7 @@ GO_WRKDIR_PKG=	${WRKDIR}/pkg/freebsd_${G
 BUILD_DEPENDS+=	${GO_CMD}:${PORTSDIR}/lang/go
 GO_ENV+=	GOPATH="${WRKDIR}:${LOCAL_GOPATH}" \
 		CGO_CFLAGS="${CGO_CFLAGS}" \
-		CGO_LDFLAGS="${CGO_LDFLAGS}"
+		CGO_LDFLAGS="${CGO_LDFLAGS}" \
 PLIST_SUB+=	GO_LIBDIR=${GO_LIBDIR} \
 		GO_SRCDIR=${GO_SRCDIR} \
 		GO_PKGNAME=${GO_PKGNAME}
@@ -57,7 +57,7 @@ post-extract:
 
 .if !target(do-build)
 do-build:
-	@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} ${GO_CMD} install -v ${GO_TARGET})
+	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install -v ${GO_TARGET})
 .endif
 
 .if !target(do-install)