From owner-freebsd-gecko@FreeBSD.ORG  Mon Aug  5 17:16:40 2013
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8EE2F86A
 for <freebsd-gecko@freebsd.org>; Mon,  5 Aug 2013 17:16:40 +0000 (UTC)
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.244.247])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 24F712950
 for <freebsd-gecko@freebsd.org>; Mon,  5 Aug 2013 17:16:39 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.244.247])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r75HGbcY069899
 for <freebsd-gecko@freebsd.org>; Mon, 5 Aug 2013 17:16:37 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r75HGWGM069552
 for freebsd-gecko@freebsd.org; Mon, 5 Aug 2013 17:16:32 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Mon, 5 Aug 2013 17:16:32 GMT
Message-Id: <201308051716.r75HGWGM069552@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
 svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
Subject: [SVN-Commit] r1305 - trunk/Mk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Aug 2013 17:16:40 -0000

Author: jbeich
Date: Mon Aug  5 17:16:32 2013
New Revision: 1305

Log:
apply r1158 to bundled nss as well

Reported by:	AN <andy@neu.net>

Modified:
   trunk/Mk/bsd.gecko.mk

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Mon Aug  5 16:05:41 2013	(r1304)
+++ trunk/Mk/bsd.gecko.mk	Mon Aug  5 17:16:32 2013	(r1305)
@@ -831,6 +831,10 @@
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=x86_64-unknown-${OPSYS:L}${OSREL}
+. if ${USE_MOZILLA:M-nss} && ${MOZILLA_VER:R:R} >= 20
+USE_BINUTILS=	# intel-gcm.s
+CFLAGS+=	-B${LOCALBASE}/bin
+. endif
 .elif ${ARCH:Mpowerpc*}
 USE_GCC?=	yes
 CFLAGS+=	-D__STDC_CONSTANT_MACROS