Only install hwasan_symbolize when found

This commit is contained in:
Sylvestre Ledru 2020-10-30 23:52:52 +01:00
parent c7b19a2e72
commit 98c4f28969
2 changed files with 7 additions and 1 deletions

2
debian/changelog vendored
View File

@ -2,7 +2,7 @@ llvm-toolchain-11 (1:11.0.0-4) unstable; urgency=medium
* Cherry-pick some fixes from * Cherry-pick some fixes from
https://github.com/opencollab/llvm-toolchain-integration-test-suite/ https://github.com/opencollab/llvm-toolchain-integration-test-suite/
* hwasan_symbolize is no longer built * Only install hwasan_symbolize when found
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 29 Oct 2020 15:44:04 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Thu, 29 Oct 2020 15:44:04 +0100

6
debian/rules vendored
View File

@ -596,6 +596,12 @@ override_dh_auto_install:
mkdir -p $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/ 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) 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) ifeq (${LIBFUZZER_ENABLE},yes)
mkdir -p $(CURDIR)/debian/libfuzzer-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/ 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/ cp -v $(TARGET_BUILD)/libFuzzer.a $(CURDIR)/debian/libfuzzer-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/