From 1957457e378ee0c48e5c18d62b310a24d52f9a4e Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 19 May 2019 21:35:39 +0200
Subject: [PATCH 1/2] check-polly was executed twice

---
 debian/changelog | 1 +
 debian/rules     | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c60b5fe..eff9bb5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ llvm-toolchain-8 (1:8.0.1~+rc1-1~exp2) experimental; urgency=medium
     Option -DLLVM_ENABLE_LTO="Thin" added
   * WebAssembly is now build by default, remove it from the
     experimental list
+  * check-polly was executed twice
 
  --
 
diff --git a/debian/rules b/debian/rules
index b633bd49..85ebf1d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -820,11 +820,6 @@ endif
 # Managed by debian build system
 	rm -f $(CURDIR)/$(TARGET_BUILD)/lib/python*/site-packages/lldb/_lldb.so
 
-# polly tests
-	if test "$(POLLY_ENABLE)" = yes; then \
-		cd $(TARGET_BUILD)/ && LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ $(MAKE) -C tools/polly/test/ check-polly || true; \
-	fi
-
 # The compression of the code coverage report is done in the
 # hook B21GetCoverageResults on the server
 	if test "$(CODECOVERAGE)" = "yes"; then \

From 5e9b72aba2d4567967efbc3a383f9635086a3a37 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 20 May 2019 10:36:23 +0200
Subject: [PATCH 2/2] Build using thinlto on non stretch, xenial and trusty
 (fails with some undef symbols)

---
 debian/changelog | 3 ++-
 debian/rules     | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eff9bb5a..e5516200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 llvm-toolchain-8 (1:8.0.1~+rc1-1~exp2) experimental; urgency=medium
 
-  * Use ThinLTO for the build
+  * Build using thinlto on non stretch, xenial and trusty
+    (fails with some undef symbols)
     Option -DLLVM_ENABLE_LTO="Thin" added
   * WebAssembly is now build by default, remove it from the
     experimental list
diff --git a/debian/rules b/debian/rules
index 85ebf1d3..c0c82528 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,8 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
 endif
 
 VENDOR=$(shell lsb_release -is)
+DISTRO=$(shell lsb_release -sc)
+
 DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}')
 
 DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -220,7 +222,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
 endif
 
 # Use thinlto for the link phase
-CMAKE_EXTRA += -DLLVM_ENABLE_LTO="Thin"
+if test ! "$DISTRO" = "stretch" -a ! "$DISTRO" = "xenial"  -a ! "$DISTRO" = "trusty"; then
+# Don't enable for old distros
+	CMAKE_EXTRA += -DLLVM_ENABLE_LTO="Thin"
+endif
 
 DH_OPTIONS=
 OCAML_ENABLE= no