mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-12-25 16:35:53 +00:00
Try to fix mips and mipsel FTBFS with approach number two in bug #877567
This commit is contained in:
parent
7489b5b30f
commit
e57a28c14a
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -1,5 +1,6 @@
|
||||
llvm-toolchain-7 (1:7-6) UNRELEASED; urgency=medium
|
||||
|
||||
[ Sylvestre Ledru ]
|
||||
* Add back libomp5-X.Y.symbols.in (untested)
|
||||
* Start the work on bootstraping clang
|
||||
- bootstrap-with-openmp-version-export-missing.diff: fix a link issue
|
||||
@ -8,6 +9,9 @@ llvm-toolchain-7 (1:7-6) UNRELEASED; urgency=medium
|
||||
https://bugs.llvm.org/show_bug.cgi?id=39162
|
||||
* Fix the install of clang bash completion
|
||||
|
||||
[ Gianfranco Costamagna ]
|
||||
* Take option two in bug #877567 to fix FTBFS on mips and mipsel
|
||||
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 06 Oct 2018 14:57:58 +0200
|
||||
|
||||
llvm-toolchain-7 (1:7-5) unstable; urgency=medium
|
||||
|
||||
21
debian/rules
vendored
21
debian/rules
vendored
@ -49,22 +49,6 @@ endif
|
||||
# Cxx flags for building libcxx and libcxxabi
|
||||
LIBCXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
|
||||
|
||||
# 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
|
||||
ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) lt 7.1.0-7~ || \
|
||||
dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 7.2.0-2; echo $$?),0)
|
||||
# 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
|
||||
|
||||
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
|
||||
@ -75,6 +59,11 @@ export CXX=g++-$(GCC_VERSION)
|
||||
|
||||
opt_flags = -O2 -DNDEBUG
|
||||
|
||||
# Only enable g1 on archs which needs it (it fixes an OOM during dh_strip due to huge symbols)
|
||||
ifeq ($(DEB_HOST_ARCH_BITS),32)
|
||||
opt_flags += -g1
|
||||
endif
|
||||
|
||||
ifneq (,$(findstring $(DEB_HOST_ARCH),armel))
|
||||
opt_flags += -marm
|
||||
# 3.8 fails to build, disable the compiler_rt builtins
|
||||
|
||||
Loading…
Reference in New Issue
Block a user