Fix the detection of gcc. This broke the build on the latest unstable

This commit is contained in:
Sylvestre Ledru 2016-08-06 20:30:11 +00:00
parent 45fe7b69ea
commit 22222abc7f
2 changed files with 8 additions and 2 deletions

6
debian/changelog vendored
View File

@ -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 <sylvestre@debian.org> 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)

4
debian/rules vendored
View File

@ -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