Rely on pre-initialized dpkg-architecture variables.

Fixes lintian: debian-rules-sets-dpkg-architecture-variable
See https://lintian.debian.org/tags/debian-rules-sets-dpkg-architecture-variable.html for more details.
This commit is contained in:
Sylvestre Ledru 2019-12-08 21:02:53 +01:00
parent e23e7aec08
commit 583a094319
2 changed files with 2 additions and 5 deletions

1
debian/changelog vendored
View File

@ -6,6 +6,7 @@ llvm-toolchain-9 (1:9.0.1~+rc2-1~exp2) UNRELEASED; urgency=medium
path-hurd.diff, libcxxabi-arm-ehabi-fix.patch, libcxxabi-test-don-t- path-hurd.diff, libcxxabi-arm-ehabi-fix.patch, libcxxabi-test-don-t-
fail-extended-long-double.patch, revert-change-soname.diff, try-to- fail-extended-long-double.patch, revert-change-soname.diff, try-to-
unbreak-thinlto.diff that are missing from debian/patches/series. unbreak-thinlto.diff that are missing from debian/patches/series.
* Rely on pre-initialized dpkg-architecture variables.
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 08 Dec 2019 21:02:49 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Sun, 08 Dec 2019 21:02:49 +0100

6
debian/rules vendored
View File

@ -33,11 +33,7 @@ DISTRO=$(shell lsb_release -sc)
DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}') DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}')
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) include /usr/share/dpkg/architecture.mk
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
LDFLAGS_EXTRA = LDFLAGS_EXTRA =
CXXFLAGS_EXTRA = CXXFLAGS_EXTRA =