Merge branch '9' of salsa.debian.org:pkg-llvm-team/llvm-toolchain into 9

debian/changelog

@@ -1,5 +1,6 @@
 llvm-toolchain-9 (1:9.0.0-3~exp2) experimental; urgency=medium
 
+<<<<<<<
   [ Weston Ortiz ]
   * Remove incorrect Breaks/Conflicts for lldb-9 package
     https://bugs.llvm.org/show_bug.cgi?id=43451
@@ -10,6 +11,17 @@ llvm-toolchain-9 (1:9.0.0-3~exp2) experimental; urgency=medium
     Disable fuzzer only for i386
   * Use stage2 files to build the doc. For some reasons, clang-tools-extra
     html generation stopped working
+=======
+  [ Weston Ortiz ]
+  * Remove incorrect Breaks/Conflicts for lldb-9 package
+    https://bugs.llvm.org/show_bug.cgi?id=43451
+
+  [ Sylvestre Ledru ]
+  * disable-fuzzer-compiler-rt.diff: bring back this patch.
+    Still breaks i386 compiler-rt/fuzzer
+    Disable fuzzer only for i386
+  * Disable z3 when the version is tool old
+>>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 30 Oct 2019 19:09:12 +0100
 

debian/rules

@@ -70,6 +70,12 @@ ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++
 	GCC_VERSION := 4.9
 endif
 
+Z3_FLAG=
+ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libz3-dev) gt 4.7.0; echo $$?),0)
+# Too old version of gcc. Force 4.9
+	Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=ON
+endif
+
 FORCE_NOT_GCC_9_DISTRO := eoan bullseye sid
 ifneq (,$(filter $(DISTRO),$(FORCE_NOT_GCC_9_DISTRO)))
 # Force gcc before 9 (gcc 8 on Debian unstable) because it causes
@@ -371,7 +377,7 @@ override_dh_auto_configure: preconfigure
 	-DLIBCLANG_LIBRARY_VERSION=$(SONAME_EXT) \
 	-DENABLE_LINKER_BUILD_ID=ON \
 	-DPOLLY_BUNDLED_JSONCPP=OFF \
-	-DLLVM_ENABLE_Z3_SOLVER=ON \
+	$(Z3_FLAG) \
 	-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="AVR" \
 	-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
 	-DCLANG_VENDOR=$(VENDOR) \