svn commit: r199581 - in projects/clangbsd: . contrib/llvm/tools/clang/lib/Driver

[Roman Divacky]

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));
 }