From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Wed, 21 Mar 2018 21:56:33 +0000 (+0000)
Subject: libfuzzer-path
X-Git-Tag: archive/raspbian/1%5.0.1-4+rpi1~2^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fd932dd240153aed1675a0396da1ae3bd83a7f37;p=llvm-toolchain-5.0.git

libfuzzer-path

===================================================================

Gbp-Pq: Name libfuzzer-path.diff
---

diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
index 00bd60bc2..a74f99a53 100644
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -600,9 +600,8 @@ collectSanitizerRuntimes(const ToolChain &TC, const ArgList &Args,
 static void addLibFuzzerRuntime(const ToolChain &TC,
                                 const ArgList &Args,
                                 ArgStringList &CmdArgs) {
-    StringRef ParentDir = llvm::sys::path::parent_path(TC.getDriver().InstalledDir);
-    SmallString<128> P(ParentDir);
-    llvm::sys::path::append(P, "lib", "libLLVMFuzzer.a");
+    SmallString<128> P;
+    llvm::sys::path::append(P, TC.getDriver().Dir, "/../lib" CLANG_LIBDIR_SUFFIX, "libFuzzer.a");
     CmdArgs.push_back(Args.MakeArgString(P));
     TC.AddCXXStdlibLibArgs(Args, CmdArgs);
 }