Re-sync LLVM to mimic the same library link spec as the base compilers.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/devel/llvm/Makefile,v retrieving revision 1.50 diff -u -p -r1.50 Makefile --- Makefile 21 Aug 2012 17:51:53 -0000 1.50 +++ Makefile 23 Aug 2012 05:41:09 -0000 @@ -10,7 +10,7 @@ COMMENT = modular, fast C/C++/ObjC compi LLVM_V = 3.1 DISTNAME = llvm-${LLVM_V}.src PKGNAME = llvm-${LLVM_V} -REVISION = 5 +REVISION = 6 CATEGORIES = devel # packager notes in http://llvm.org/docs/Packaging.html Index: patches/patch-tools_clang_lib_Driver_Tools_cpp =================================================================== RCS file: /home/cvs/ports/devel/llvm/patches/patch-tools_clang_lib_Driver_Tools_cpp,v retrieving revision 1.10 diff -u -p -r1.10 patch-tools_clang_lib_Driver_Tools_cpp --- patches/patch-tools_clang_lib_Driver_Tools_cpp 21 Aug 2012 17:51:53 -0000 1.10 +++ patches/patch-tools_clang_lib_Driver_Tools_cpp 25 Aug 2012 14:30:40 -0000 @@ -1,29 +1,27 @@ $OpenBSD: patch-tools_clang_lib_Driver_Tools_cpp,v 1.10 2012/08/21 17:51:53 pascal Exp $ --- tools/clang/lib/Driver/Tools.cpp.orig Wed Apr 18 17:32:25 2012 -+++ tools/clang/lib/Driver/Tools.cpp Thu Aug 16 02:23:30 2012 -@@ -4672,14 +4672,20 @@ void openbsd::Link::ConstructJob(Compilation &C, const ++++ tools/clang/lib/Driver/Tools.cpp Sat Aug 25 10:29:30 2012 +@@ -4672,14 +4672,21 @@ void openbsd::Link::ConstructJob(Compilation &C, const // the default system libraries. Just mimic this for now. CmdArgs.push_back("-lgcc"); - if (Args.hasArg(options::OPT_pthread)) - CmdArgs.push_back("-lpthread"); -- if (!Args.hasArg(options::OPT_shared)) { -- if (Args.hasArg(options::OPT_pg)) -- CmdArgs.push_back("-lc_p"); + if (Args.hasArg(options::OPT_pthread)) { + if (!Args.hasArg(options::OPT_shared) && + Args.hasArg(options::OPT_pg)) + CmdArgs.push_back("-lpthread_p"); - else -- CmdArgs.push_back("-lc"); ++ else + CmdArgs.push_back("-lpthread"); - } ++ } + -+ if (!Args.hasArg(options::OPT_shared) && -+ Args.hasArg(options::OPT_pg)) -+ CmdArgs.push_back("-lc_p"); -+ else -+ CmdArgs.push_back("-lc"); + if (!Args.hasArg(options::OPT_shared)) { +- if (Args.hasArg(options::OPT_pg)) ++ if (Args.hasArg(options::OPT_pg)) + CmdArgs.push_back("-lc_p"); + else + CmdArgs.push_back("-lc"); + } + CmdArgs.push_back("-lgcc"); } -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.