From 7e0af84d6e8ae443af6d74705df1694cf0b5c953 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 3 Jul 2022 18:16:42 +0200 Subject: [PATCH] On Debian stretch, force the usage of g++-7 --- debian/changelog | 6 ++++++ debian/rules | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 748933ee..51a98fd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-snapshot (1:15~++20220625103012+3d37e785c77a-1~exp2) experimental; urgency=medium + + * On Debian stretch, force the usage of g++-7 + + -- Sylvestre Ledru Sun, 03 Jul 2022 18:16:34 +0200 + llvm-toolchain-snapshot (1:15~++20220625103012+3d37e785c77a-1~exp1) experimental; urgency=medium [ John Paul Adrian Glaubitz ] diff --git a/debian/rules b/debian/rules index ef2aa71d..65a89337 100755 --- a/debian/rules +++ b/debian/rules @@ -104,6 +104,13 @@ ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++ GCC_VERSION := 4.9 endif +ifneq (,$(filter $(DISTRO),stretch)) +# from llvm 15, we need gcc at least 7 + GCC_VERSION := 7 +# Don't enable lld python for old distros + STAGE_ALL_CMAKE_EXTRA += -DLLDB_ENABLE_PYTHON=OFF +endif + Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=OFF ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libz3-dev) gt 4.7.0; echo $$?),0) # no ocaml support in main for Ubuntu @@ -363,11 +370,6 @@ else PROJECTS+=;lldb endif -ifneq (,$(filter $(DISTRO),stretch)) -# Don't enable lld python for old distros - STAGE_ALL_CMAKE_EXTRA += -DLLDB_ENABLE_PYTHON=OFF -endif - LLD_ENABLE=yes