From owner-freebsd-gecko@FreeBSD.ORG  Sun Mar 31 09:01:18 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 2F8F9915
 for <freebsd-gecko@freebsd.org>; Sun, 31 Mar 2013 09:01:18 +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 BE63E1E4
 for <freebsd-gecko@freebsd.org>; Sun, 31 Mar 2013 09:01:17 +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 r2V919aM078545
 for <freebsd-gecko@freebsd.org>; Sun, 31 Mar 2013 09:01:09 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r2V914qm078439
 for freebsd-gecko@freebsd.org; Sun, 31 Mar 2013 09:01:04 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Sun, 31 Mar 2013 09:01:04 GMT
Message-Id: <201303310901.r2V914qm078439@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] r1224 - 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: Sun, 31 Mar 2013 09:01:18 -0000

Author: jbeich
Date: Sun Mar 31 09:01:04 2013
New Revision: 1224

Log:
temporarily avoid picking up clang from ports

PR:		ports/177224

Modified:
   trunk/Mk/bsd.gecko.mk

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Sat Mar 30 11:42:16 2013	(r1223)
+++ trunk/Mk/bsd.gecko.mk	Sun Mar 31 09:01:04 2013	(r1224)
@@ -544,18 +544,15 @@
 LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-z,origin -Wl,-rpath,\\\$$\$$ORIGIN
 
 .if ${MOZILLA_VER:R:R} >= 19 || ${MOZILLA:Mseamonkey*}
-# prefer clang
-. if ${CC} == "cc" && (exists(/usr/bin/clang) || \
-  exists(${LOCALBASE}/bin/clang))
-CC=				clang
+# prefer base clang, for lang/clang{,-devel} see ports/177224
+. if ${CC} == "cc" && exists(/usr/bin/clang)
+CC=				/usr/bin/clang
 . endif
-. if ${CXX} == "c++" && (exists(/usr/bin/clang++) || \
-  exists(${LOCALBASE}/bin/clang++))
-CXX=			clang++
+. if ${CXX} == "c++" && exists(/usr/bin/clang++)
+CXX=			/usr/bin/clang++
 . endif
-. if ${CPP} == "cpp" && (exists(/usr/bin/clang-cpp) || \
-  exists(${LOCALBASE}/bin/clang-cpp))
-CPP=			clang-cpp
+. if ${CPP} == "cpp" && exists(/usr/bin/clang-cpp)
+CPP=			/usr/bin/clang-cpp
 . endif
 . if ${CC} != "cc" && ${CPP} == "cpp"
 CPP=			${CC} -E
@@ -941,7 +938,7 @@
 		-e 's|mozilla/plugins|browser_plugins|g' \
 		${MOZSRC}/xpcom/io/nsAppFileLocationProvider.cpp \
 		${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp
-.if ${CXX} == "clang++" && ${OSVERSION} < 900506
+.if !empty(CXX:M*clang*) && ${OSVERSION} < 900506
 	@${GREP} -Flr -- '-mss' ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -e 's/-mss/-mmmx &/'
 .endif