* Try to fix the mipsel FTBFS (Closes: #877567)

I am trying the first option from the bug:
  - gsplit-dward on 32 bits archs
  - -g everywhere
  Many thanks to Adrian Bunk for that
This commit is contained in:
Sylvestre Ledru 2017-10-21 11:59:51 +00:00
parent e81253c1aa
commit 157ea71cc3
2 changed files with 7 additions and 9 deletions

5
debian/changelog vendored
View File

@ -4,6 +4,11 @@ llvm-toolchain-snapshot (1:6.0~svn315736-2) unstable; urgency=medium
* Update d/rules to reflect the move of libfuzzer into compiler-rt
* Update of the copyright file (Closes: #878502)
Thanks to Nicholas D Steeves for the work
* Try to fix the mipsel FTBFS (Closes: #877567)
I am trying the first option from the bug:
- gsplit-dward on 32 bits archs
- -g everywhere
Many thanks to Adrian Bunk for that
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 16 Oct 2017 10:24:33 +0200

11
debian/rules vendored
View File

@ -34,9 +34,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe))
LDFLAGS_EXTRA += -latomic
endif
ENABLE_SPLIT_DWARF_ARCHS := armel armhf i386 mips powerpc
# Only enable gsplit dwarf on archs which needs it
ifneq (,$(filter $(DEB_HOST_ARCH),$(ENABLE_SPLIT_DWARF_ARCHS)))
# Only enable gsplit dwarf on archs which needs it (32 bits)
ifeq ($(DEB_HOST_ARCH_BITS),32)
ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.22.52.0.4 ; echo $$?),0)
# when using -gsplit-dwarf, it will requires extract-dwo which doesn't exist on precise:
# More: https://llvm.org/bugs/show_bug.cgi?id=28841
@ -51,7 +50,6 @@ endif # < gcc 7 or >= 7.2.0-2
endif # binutils
endif # archs
ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) lt 4.9-20140411-1~ ; echo $$?),0)
# Too old version of gcc. Force 4.9
GCC_VERSION := 4.9
@ -61,11 +59,6 @@ export CC=gcc-$(GCC_VERSION)
export CXX=g++-$(GCC_VERSION)
opt_flags = -O2 -DNDEBUG
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 ppc64el s390x))
opt_flags += -g1
else
opt_flags += -g
endif
ifneq (,$(findstring $(DEB_HOST_ARCH),armel))
opt_flags += -marm