From 4ce48823b9b44aaf168272e4079d55e5bf5ee773 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 3 Sep 2017 13:15:24 +0000 Subject: [PATCH] Fail the build if the arch + gcc has a broken gsplit-dwarf support --- debian/changelog | 6 ++++++ debian/rules | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f9c9d4aa..19e3ca30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-4.0 (1:4.0.1-4) unstable; urgency=medium + + * Fail the build if the arch + gcc has a broken gsplit-dwarf support + + -- Sylvestre Ledru Sun, 03 Sep 2017 15:13:14 +0200 + llvm-toolchain-4.0 (1:4.0.1-3) unstable; urgency=medium * Fix the FTBFS because of -gsplit-dwarf: diff --git a/debian/rules b/debian/rules index fa88e547..b6d9f448 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe)) LDFLAGS_EXTRA += -latomic endif -ENABLE_SPLIT_DWARF_ARCHS := armel armhf i386 mips powerpc +ENABLE_SPLIT_DWARF_ARCHS := armel armhf i386 mips powerpc amd64 # Only enable gsplit dwarf on archs which needs it ifneq (,$(filter $(DEB_HOST_ARCH),$(ENABLE_SPLIT_DWARF_ARCHS))) ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.22.52.0.4 ; echo $$?),0) @@ -46,6 +46,8 @@ ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++ # Only pass -gsplit-dwarf with working version of gcc 7 # More: https://bugs.llvm.org/show_bug.cgi?id=34140 & https://bugs.debian.org/873609 CXXFLAGS_EXTRA += -gsplit-dwarf +else +$(error "Broken gcc version for -gsplit-dwarf support. Please use < gcc 7 or > 7.2.0-2") endif # < gcc 7 or > 7.2.0-2 endif # binutils endif # archs