Date: Fri, 5 Mar 2010 21:04:44 +0000 (UTC) From: Roman Divacky <rdivacky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r204770 - in projects/clangbsd: . contrib/llvm/tools/clang/lib/Driver Message-ID: <201003052104.o25L4ijf011882@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rdivacky Date: Fri Mar 5 21:04:44 2010 New Revision: 204770 URL: http://svn.freebsd.org/changeset/base/204770 Log: Search for as/ld in PATH and change -B setting in world stage to direclty point to WORLDTMP/usr/bin. So this setup works with gcc too. 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 Mar 5 20:51:40 2010 (r204769) +++ projects/clangbsd/Makefile.inc1 Fri Mar 5 21:04:44 2010 (r204770) @@ -258,8 +258,8 @@ WMAKEENV= ${CROSSENV} \ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ - CC="${CC} -isystem ${WORLDTMP}/usr/include -B${WORLDTMP} -L${WORLDTMP}/usr/lib/" \ - CXX="${CXX} -isystem ${WORLDTMP}/include/c++/4.2 -isystem ${WORLDTMP}/include/c++/4.2/backward -B${WORLDTMP} -L${WORLDTMP}/usr/lib/" + CC="${CC} -isystem ${WORLDTMP}/usr/include -B${WORLDTMP}/usr/bin/ -L${WORLDTMP}/usr/lib/" \ + CXX="${CXX} -isystem ${WORLDTMP}/include/c++/4.2 -isystem ${WORLDTMP}/include/c++/4.2/backward -B${WORLDTMP}/usr/bin/ -L${WORLDTMP}/usr/lib/" .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 Mar 5 20:51:40 2010 (r204769) +++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Fri Mar 5 21:04:44 2010 (r204770) @@ -2638,7 +2638,7 @@ void freebsd::Assemble::ConstructJob(Com } const char *Exec = - Args.MakeArgString(getToolChain().GetProgramPath(C, "/usr/bin/as")); + Args.MakeArgString(getToolChain().GetProgramPath(C, "as")); Dest.addCommand(new Command(JA, *this, Exec, CmdArgs)); } @@ -2756,7 +2756,7 @@ void freebsd::Link::ConstructJob(Compila } const char *Exec = - Args.MakeArgString(getToolChain().GetProgramPath(C, "/usr/bin/ld")); + Args.MakeArgString(getToolChain().GetProgramPath(C, "ld")); Dest.addCommand(new Command(JA, *this, Exec, CmdArgs)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003052104.o25L4ijf011882>