Revert compiler-rt hacks

This commit is contained in:
Gianfranco Costamagna 2024-03-08 16:04:40 +01:00
parent 20819031eb
commit 8c3b7796c4

18
debian/rules vendored
View File

@ -22,16 +22,7 @@ endif
# dpkg-buildflags support
# disable fixfilepath in favor of the llvm-project supplied flavor, disable lto
export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto
ifeq ($(DEB_HOST_ARCH),i386)
RUNTIMES = compiler-rt;libcxx;libcxxabi
else
ifeq ($(DEB_HOST_ARCH_BITS),32)
RUNTIMES = libcxx;libcxxabi
skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev
else
RUNTIMES = compiler-rt;libcxx;libcxxabi
endif
endif
SOURCE_NAME := $(shell dpkg-parsechangelog -S Source)
ifneq (,$(findstring snapshot,$(SOURCE_NAME)))
@ -1048,7 +1039,7 @@ override_dh_auto_install:
ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe sparc sparc64))
ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
# To fix custom-library-search-path
chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so || true
chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so
endif
endif
@ -1299,7 +1290,7 @@ else
rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
endif
endif
dh_install --fail-missing ${skip_packages}
dh_install --fail-missing
# Move the libc++ abi files from libc++ to libc++-abi for the wasm32 packages
# These packages are arch: all, so only do so when the packages are built
ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(shell dh_listpackages)))
@ -1427,11 +1418,8 @@ override_dh_auto_test:
endif
override_dh_builddeb:
dh_builddeb ${skip_packages}
override_dh_gencontrol: sccache-stats
dh_gencontrol ${skip_packages} -- $(control_vars)
dh_gencontrol -- $(control_vars)
override_dh_auto_clean: