From owner-svn-src-projects@FreeBSD.ORG  Wed Feb 17 10:34:12 2010
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 65702106566B;
	Wed, 17 Feb 2010 10:34:12 +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 54FF88FC16;
	Wed, 17 Feb 2010 10:34:12 +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 o1HAYCZI017008;
	Wed, 17 Feb 2010 10:34:12 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1HAYCen017006;
	Wed, 17 Feb 2010 10:34:12 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <201002171034.o1HAYCen017006@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Wed, 17 Feb 2010 10:34:12 +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: r203999 -
	projects/clangbsd/contrib/llvm/tools/clang/lib/Driver
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: Wed, 17 Feb 2010 10:34:12 -0000

Author: rdivacky
Date: Wed Feb 17 10:34:12 2010
New Revision: 203999
URL: http://svn.freebsd.org/changeset/base/203999

Log:
  Chase upstream.

Modified:
  projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp

Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Wed Feb 17 10:27:07 2010	(r203998)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Wed Feb 17 10:34:12 2010	(r203999)
@@ -2642,7 +2642,7 @@ void freebsd::Link::ConstructJob(Compila
 
   if (!Args.hasArg(options::OPT_nostdlib) &&
       !Args.hasArg(options::OPT_nodefaultlibs)) {
-    if (getToolChain().getDriver().CCCIsCXX) {
+    if (D.CCCIsCXX) {
       CmdArgs.push_back("-lstdc++");
       CmdArgs.push_back("-lm");
     }