From 98c4f289698596de0769abc2f32de8a19339adb3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 30 Oct 2020 23:52:52 +0100 Subject: [PATCH] Only install hwasan_symbolize when found --- debian/changelog | 2 +- debian/rules | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cab68694..baa90d6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ llvm-toolchain-11 (1:11.0.0-4) unstable; urgency=medium * Cherry-pick some fixes from https://github.com/opencollab/llvm-toolchain-integration-test-suite/ - * hwasan_symbolize is no longer built + * Only install hwasan_symbolize when found -- Sylvestre Ledru Thu, 29 Oct 2020 15:44:04 +0100 diff --git a/debian/rules b/debian/rules index b2bcb90b..b9eccb56 100755 --- a/debian/rules +++ b/debian/rules @@ -596,6 +596,12 @@ override_dh_auto_install: mkdir -p $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/ cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/asan_symbolize-$(LLVM_VERSION) +# For some reasons, hwasan_symbolize is sometimes built + if test $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/bin/hwasan_symbolize; then \ + mkdir -p $(CURDIR)/debian/clang-tools-$(LLVM_VERSION)/usr/bin/; \ + mv $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/bin/hwasan_symbolize $(CURDIR)/debian/clang-tools-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/bin/; \ + fi + ifeq (${LIBFUZZER_ENABLE},yes) mkdir -p $(CURDIR)/debian/libfuzzer-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/ cp -v $(TARGET_BUILD)/libFuzzer.a $(CURDIR)/debian/libfuzzer-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/