diff --git a/debian/changelog b/debian/changelog index 164f96fb..f3d02f22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:4.0~svn275970-1~exp2) experimental; urgency=medium +llvm-toolchain-snapshot (1:4.0~svn275971-1~exp1) experimental; urgency=medium * Sync the 3.9 changes into 4.0 * Fix the cmake paths in llvm-4.0-dev deb package. Thanks to Brad King @@ -15,6 +15,7 @@ llvm-toolchain-snapshot (1:4.0~svn275970-1~exp2) experimental; urgency=medium * Fix some lintian overrides * Generate more manpages * Remove some garbage from the manpages (Closes: #815991, #804347) + * Disable -gsplit-dwarf on Ubuntu precise -- Sylvestre Ledru Mon, 25 Jul 2016 12:19:52 +0200 diff --git a/debian/rules b/debian/rules index 542d3e80..d5db045b 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) OCAML_STDLIB_DIR ?= $(shell ocamlc -where) LDFLAGS_EXTRA = -CXXFLAGS_EXTRA = -std=c++0x -gsplit-dwarf +CXXFLAGS_EXTRA = -std=c++0x CONFIGURE_EXTRA = CMAKE_EXTRA = @@ -33,6 +33,13 @@ ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe)) LDFLAGS_EXTRA += -latomic endif +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 +CXXFLAGS_EXTRA += -gsplit-dwarf +endif + + ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) lt 4.7.2-10~ ; echo $$?),0) # Too old version of gcc. Force 4.9 GCC_VERSION := 4.9