From 22222abc7fb8827c973ecd271874b317aaacf58f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 6 Aug 2016 20:30:11 +0000 Subject: [PATCH] Fix the detection of gcc. This broke the build on the latest unstable --- debian/changelog | 6 ++++++ debian/rules | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f5c2da2e..4af7d28f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.8 (1:3.8.1-7) unstable; urgency=medium + + * Fix the detection of gcc. This broke the build on the latest unstable + + -- Sylvestre Ledru Fri, 05 Aug 2016 09:55:15 +0200 + llvm-toolchain-3.8 (1:3.8.1-6) unstable; urgency=medium * Ship libFuzzer in its own package (libfuzzer-X.Y-dev) (Closes: #820159) diff --git a/debian/rules b/debian/rules index 22f81e9c..70f2c8ee 100755 --- a/debian/rules +++ b/debian/rules @@ -3,9 +3,9 @@ TARGET_BUILD := build-llvm DEB_INST := $(CURDIR)/debian/tmp/ #GCC_VERSION := 4.8 -# The 5| in the regexp is a crappy workaround. g++ 5.2 in Debian is not providing a g++-5.2 binary (only g++-5) +# The 5|6| in the regexp is a crappy workaround. g++ 5.2 in Debian is not providing a g++-5.2 binary (only g++-5) # accomodate that by hardcoding the 5 detection -GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?(5|[0-9]+\.[0-9]+|[0-9]+).*$$,\2,p') +GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?(5|6|[0-9]+\.[0-9]+|[0-9]+).*$$,\2,p') LLVM_VERSION := 3.8 LLVM_VERSION_FULL := $(LLVM_VERSION).1 SONAME_EXT := 1