[cfe-commits] Fix search path for clang on latest DragonFly releases

[Joerg Sonnenberger]

On Fri, Nov 23, 2012 at 07:41:26PM +0100, John Marino wrote:
>  Tool &DragonFly::SelectTool(const Compilation &C, const JobAction &JA,
> --- tools/clang/lib/Driver/Tools.cpp.orig	2012-04-18 21:32:25.000000000 +0000
> +++ tools/clang/lib/Driver/Tools.cpp
> @@ -5499,14 +5499,21 @@ void dragonfly::Link::ConstructJob(Compi
>        !Args.hasArg(options::OPT_nodefaultlibs)) {
>      // FIXME: GCC passes on -lgcc, -lgcc_pic and a whole lot of
>      //         rpaths
> -    CmdArgs.push_back("-L/usr/lib/gcc41");
> +    CmdArgs.push_back("-L/usr/lib/gcc47");
> +    CmdArgs.push_back("-L/usr/lib/gcc44");
>  
>      if (!Args.hasArg(options::OPT_static)) {
>        CmdArgs.push_back("-rpath");
> -      CmdArgs.push_back("/usr/lib/gcc41");
> +      CmdArgs.push_back("/usr/lib/gcc47");
>  
>        CmdArgs.push_back("-rpath-link");
> -      CmdArgs.push_back("/usr/lib/gcc41");
> +      CmdArgs.push_back("/usr/lib/gcc47");
> +
> +      CmdArgs.push_back("-rpath");
> +      CmdArgs.push_back("/usr/lib/gcc44");
> +
> +      CmdArgs.push_back("-rpath-link");
> +      CmdArgs.push_back("/usr/lib/gcc44");
>  
>        CmdArgs.push_back("-rpath");
>        CmdArgs.push_back("/usr/lib");

This part doesn't make sense. -rpath includes -rpath-link...

Joerg