From owner-svn-ports-head@FreeBSD.ORG  Sun Dec  7 09:25:01 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 50275D31;
 Sun,  7 Dec 2014 09:25:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3BEC3981;
 Sun,  7 Dec 2014 09:25:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB79P1Me083041;
 Sun, 7 Dec 2014 09:25:01 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB79P0Hh083036;
 Sun, 7 Dec 2014 09:25:00 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201412070925.sB79P0Hh083036@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 7 Dec 2014 09:25:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r374178 - in head: databases/gosqlite3 lang/go/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Dec 2014 09:25:01 -0000

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@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)