mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2026-01-03 16:53:52 +00:00
Merge remote-tracking branch 'origin/6.0' into snapshot
This commit is contained in:
commit
28562ecb44
16
debian/patches/libfuzzer-path.diff
vendored
16
debian/patches/libfuzzer-path.diff
vendored
@ -1,16 +0,0 @@
|
||||
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
|
||||
@@ -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);
|
||||
- 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);
|
||||
}
|
||||
1
debian/rules
vendored
1
debian/rules
vendored
@ -338,6 +338,7 @@ build_doc:
|
||||
cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js && cd -; \
|
||||
done
|
||||
|
||||
mkdir debian/man/
|
||||
help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1
|
||||
help2man --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user