From 35a0b39ee7122180007b023cd4191c56353cad4d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 31 Oct 2020 09:16:25 +0100 Subject: [PATCH] move the hwasn thing elsewhere --- debian/rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index b9eccb56..fba08427 100755 --- a/debian/rules +++ b/debian/rules @@ -596,12 +596,6 @@ 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/ @@ -683,6 +677,12 @@ endif # Managed in python*-lldb-X.Y.links.in rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/_lldb.so +# 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 + # Manage the polly files. Sometimes, we build them. Sometimes not. if test "$(POLLY_ENABLE)" = yes; then \ mkdir -p $(CURDIR)/debian/libclang-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/ $(CURDIR)/debian/libclang-common-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/polly/; \