From owner-freebsd-gecko@FreeBSD.ORG  Tue Feb 19 11:59:03 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])
 by hub.freebsd.org (Postfix) with ESMTP id 78B878C9
 for <freebsd-gecko@freebsd.org>; Tue, 19 Feb 2013 11:59:03 +0000 (UTC)
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 12954832
 for <freebsd-gecko@freebsd.org>; Tue, 19 Feb 2013 11:59:02 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1JBx19L058474
 for <freebsd-gecko@freebsd.org>; Tue, 19 Feb 2013 11:59:01 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1JBwuMW058204
 for freebsd-gecko@freebsd.org; Tue, 19 Feb 2013 11:58:56 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Tue, 19 Feb 2013 11:58:56 GMT
Message-Id: <201302191158.r1JBwuMW058204@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] r1178 - trunk/security/nss
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: Tue, 19 Feb 2013 11:59:03 -0000

Author: jbeich
Date: Tue Feb 19 11:58:55 2013
New Revision: 1178

Log:
- backout r1174, it's no issue with CC=clang
- limit workaround to an arch where it's used

Modified:
   trunk/security/nss/Makefile

Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile	Tue Feb 19 05:48:27 2013	(r1177)
+++ trunk/security/nss/Makefile	Tue Feb 19 11:58:55 2013	(r1178)
@@ -55,11 +55,10 @@
 .if ${ARCH} == amd64
 USE_BINUTILS=	# intel-gcm.s
 CFLAGS+=	-B${LOCALBASE}/${CONFIGURE_TARGET:S/amd64/x86_64/}/bin
-.endif
-
-.if ${CC:T:M*clang*} || ${CC:Mcc} && ${OSVERSION} > 1000023
+.if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023
 EXTRA_PATCHES+=	${FILESDIR}/extra-bug835050
 .endif
+.endif
 
 check regression-test test:
 	cd ${WRKSRC}/tests;	\