From owner-svn-src-projects@FreeBSD.ORG  Mon Oct 19 20:11:05 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 80B66106566B;
	Mon, 19 Oct 2009 20:11:05 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 710168FC08;
	Mon, 19 Oct 2009 20:11:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9JKB5hD011399;
	Mon, 19 Oct 2009 20:11:05 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9JKB5ud011397;
	Mon, 19 Oct 2009 20:11:05 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200910192011.n9JKB5ud011397@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Mon, 19 Oct 2009 20:11:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198248 - projects/clangbsd
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Oct 2009 20:11:05 -0000

Author: rdivacky
Date: Mon Oct 19 20:11:05 2009
New Revision: 198248
URL: http://svn.freebsd.org/changeset/base/198248

Log:
  Define CC/CXX for world stage as $CC/$CXX -isystem. This way we dont have to
  alter hardcoded paths in the compiler (like in gcc) yet it still picks up
  the right includes. This should work for in-tree (ie. modified with altered
  paths) gcc.
  
  Clue provided by:	kan

Modified:
  projects/clangbsd/Makefile.inc1

Modified: projects/clangbsd/Makefile.inc1
==============================================================================
--- projects/clangbsd/Makefile.inc1	Mon Oct 19 19:45:57 2009	(r198247)
+++ projects/clangbsd/Makefile.inc1	Mon Oct 19 20:11:05 2009	(r198248)
@@ -256,7 +256,9 @@ WMAKEENV=	${CROSSENV} \
 		_SHLIBDIRPREFIX=${WORLDTMP} \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
-		PATH=${TMPPATH}
+		PATH=${TMPPATH} \
+		CC="${CC} -isystem ${WORLDTMP}/usr/include" \
+		CXX="${CXX} -isystem ${WORLDTMP}/include/c++/4.2 -isystem ${WORLDTMP}/include/c++/4.2/backward"
 .if ${MK_CDDL} == "no" || defined(NO_CTF)
 WMAKEENV+=	NO_CTF=1
 .endif