From 4dac68ac24f66dea1dcfd64135989c86bd6532a6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 22 Dec 2017 17:32:18 +0000 Subject: [PATCH] fix the fuzzer patch --- debian/patches/libfuzzer-path.diff | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/patches/libfuzzer-path.diff b/debian/patches/libfuzzer-path.diff index 96c18a35..6b2c7ef4 100644 --- a/debian/patches/libfuzzer-path.diff +++ b/debian/patches/libfuzzer-path.diff @@ -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); }