[SCM] qtbase packaging branch, master, updated. debian/5.9.2+dfsg-4-8-g6f1504c

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=6f1504c

The following commit has been merged in the master branch:
commit 6f1504c18d97a58e73a94c7cc885be7374039914
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Nov 27 11:10:13 2017 +0300

    Set QMAKE_LINK in a way that works with recursive builds.
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 1534f37..0e6ee40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -263,7 +263,7 @@ endif
 		"-qtconf /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf" \
 		'QMAKE_CC=$${CC:-$(DEB_HOST_GNU_TYPE)-gcc}' \
 		'QMAKE_CXX=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
-		"QMAKE_LINK='\$$(CXX)'" \
+		'QMAKE_LINK=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
 		"PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config" \
 		'"$$@"' \
 		>> debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake

-- 
qtbase packaging