| From a12fc090b3b43fe25c7de50c09782611e3834aeb Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> |
| Date: Sat, 14 Jun 2014 19:35:33 +0200 |
| Subject: [PATCH] clang gentoo fixes |
| |
| --- |
| tools/clang/lib/Driver/Tools.cpp | 6 +++--- |
| tools/clang/tools/scan-build/scan-build | 4 ++-- |
| tools/clang/tools/scan-view/scan-view | 2 +- |
| 3 files changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp |
| index b013eb5..dbbcacb 100644 |
| --- a/tools/clang/lib/Driver/Tools.cpp |
| +++ b/tools/clang/lib/Driver/Tools.cpp |
| @@ -222,7 +222,7 @@ static void addProfileRT(const ToolChain &TC, const ArgList &Args, |
| // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is |
| // not supported by old linkers. |
| std::string ProfileRT = |
| - std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a"; |
| + "-l:libprofile_rt.a"; |
| |
| CmdArgs.push_back(Args.MakeArgString(ProfileRT)); |
| } |
| @@ -5911,7 +5911,7 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA, |
| // forward. |
| if (D.IsUsingLTO(Args)) { |
| CmdArgs.push_back("-plugin"); |
| - std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; |
| + std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so"; |
| CmdArgs.push_back(Args.MakeArgString(Plugin)); |
| |
| // Try to pass driver level flags relevant to LTO code generation down to |
| @@ -6534,7 +6534,7 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, |
| // forward. |
| if (D.IsUsingLTO(Args)) { |
| CmdArgs.push_back("-plugin"); |
| - std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; |
| + std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so"; |
| CmdArgs.push_back(Args.MakeArgString(Plugin)); |
| |
| // Try to pass driver level flags relevant to LTO code generation down to |
| diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build |
| index 0f119f6..58f78d9 100755 |
| --- a/tools/clang/tools/scan-build/scan-build |
| +++ b/tools/clang/tools/scan-build/scan-build |
| @@ -419,7 +419,7 @@ sub CopyFiles { |
| |
| my $Dir = shift; |
| |
| - my $JS = Cwd::realpath("$RealBin/sorttable.js"); |
| + my $JS = Cwd::realpath("@EPREFIX@/usr/share/llvm/sorttable.js"); |
| |
| DieDiag("Cannot find 'sorttable.js'.\n") |
| if (! -r $JS); |
| @@ -429,7 +429,7 @@ sub CopyFiles { |
| DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n") |
| if (! -r "$Dir/sorttable.js"); |
| |
| - my $CSS = Cwd::realpath("$RealBin/scanview.css"); |
| + my $CSS = Cwd::realpath("@EPREFIX@/usr/share/llvm/scanview.css"); |
| |
| DieDiag("Cannot find 'scanview.css'.\n") |
| if (! -r $CSS); |
| diff --git a/tools/clang/tools/scan-view/scan-view b/tools/clang/tools/scan-view/scan-view |
| index fb27da6..1f8ddb8 100755 |
| --- a/tools/clang/tools/scan-view/scan-view |
| +++ b/tools/clang/tools/scan-view/scan-view |
| @@ -54,7 +54,7 @@ def start_browser(port, options): |
| webbrowser.open(url) |
| |
| def run(port, options, root): |
| - import ScanView |
| + from clang import ScanView |
| try: |
| print 'Starting scan-view at: http://%s:%d'%(options.host, |
| port) |
| -- |
| 2.0.0 |
| |