fix the fuzzer patch

This commit is contained in:
Sylvestre Ledru 2017-12-22 17:32:18 +00:00
parent fd40b6607b
commit 4dac68ac24

View File

@ -2,13 +2,15 @@ Index: llvm-toolchain-5.0-5.0.1/clang/lib/Driver/ToolChains/CommonArgs.cpp
===================================================================
--- llvm-toolchain-5.0-5.0.1.orig/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ llvm-toolchain-5.0-5.0.1/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -602,7 +602,8 @@ static void addLibFuzzerRuntime(const To
@@ -600,9 +600,8 @@ collectSanitizerRuntimes(const ToolChain
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);
- 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(ToolChain.getDriver().Dir);
+ llvm::sys::path::append(P, + "/../lib" CLANG_LIBDIR_SUFFIX, "libfuzzer.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);
}