From owner-svn-src-projects@FreeBSD.ORG  Fri Nov 20 14:50:03 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 B7A031065698;
	Fri, 20 Nov 2009 14:50:03 +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 8C92C8FC1B;
	Fri, 20 Nov 2009 14:50:03 +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 nAKEo3Ik047006;
	Fri, 20 Nov 2009 14:50:03 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAKEo3Vd047003;
	Fri, 20 Nov 2009 14:50:03 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911201450.nAKEo3Vd047003@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Fri, 20 Nov 2009 14:50:03 +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: r199581 - in 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: Fri, 20 Nov 2009 14:50:03 -0000

Author: rdivacky
Date: Fri Nov 20 14:50:03 2009
New Revision: 199581
URL: http://svn.freebsd.org/changeset/base/199581

Log:
  Add -B to WMAKE to use the right tools (and libraries in the future)
  Hardcode paths to ld/as just like in-tree gcc does
  
  Suggested by:	ru

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

Modified: projects/clangbsd/Makefile.inc1
==============================================================================
--- projects/clangbsd/Makefile.inc1	Fri Nov 20 13:28:06 2009	(r199580)
+++ projects/clangbsd/Makefile.inc1	Fri Nov 20 14:50:03 2009	(r199581)
@@ -257,8 +257,8 @@ WMAKEENV=	${CROSSENV} \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
-		CC="${CC} -isystem ${WORLDTMP}/usr/include" \
-		CXX="${CXX} -isystem ${WORLDTMP}/include/c++/4.2 -isystem ${WORLDTMP}/include/c++/4.2/backward"
+		CC="${CC} -isystem ${WORLDTMP}/usr/include -B${WORLDTMP}" \
+		CXX="${CXX} -isystem ${WORLDTMP}/include/c++/4.2 -isystem ${WORLDTMP}/include/c++/4.2/backward -B${WORLDTMP}"
 
 .if ${MK_CDDL} == "no" || defined(NO_CTF)
 WMAKEENV+=	NO_CTF=1

Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Fri Nov 20 13:28:06 2009	(r199580)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Fri Nov 20 14:50:03 2009	(r199581)
@@ -2532,7 +2532,7 @@ void freebsd::Assemble::ConstructJob(Com
   }
 
   const char *Exec =
-    Args.MakeArgString(getToolChain().GetProgramPath(C, "as"));
+    Args.MakeArgString(getToolChain().GetProgramPath(C, "/usr/bin/as"));
   Dest.addCommand(new Command(JA, Exec, CmdArgs));
 }
 
@@ -2649,7 +2649,7 @@ void freebsd::Link::ConstructJob(Compila
   }
 
   const char *Exec =
-    Args.MakeArgString(getToolChain().GetProgramPath(C, "ld"));
+    Args.MakeArgString(getToolChain().GetProgramPath(C, "/usr/bin/ld"));
   Dest.addCommand(new Command(JA, Exec, CmdArgs));
 }