[debhelper-devel] [debhelper] 01/01: qmake: Set QMAKE_LINK correctly for cross-builds

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit e23dbeeeee078f692233b46c1868dc8b36276436
Author: Dmitry Shachnev <mitya57 at debian.org>
Date:   Tue Nov 14 22:00:00 2017 +0000

    qmake: Set QMAKE_LINK correctly for cross-builds
---
 debian/changelog                          | 4 ++++
 lib/Debian/Debhelper/Buildsystem/qmake.pm | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bb4f9c8..7288423 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 debhelper (10.10.8) UNRELEASED; urgency=medium
 
+  [ Niels Thykier ]
   * Document that compat 11 is now in its open beta phase.
   * Dh_Getopt: Improve warning message when a package is excluded
     due to profiles or architecture restrictions.
   * dh_install: Properly allow patterns to be excluded without
     complaining about missing files.  (Closes: #881658)
 
+  [ Dmitry Shachnev ]
+  * qmake.pm: Set QMAKE_LINK correctly for cross-builds.
+
  -- Niels Thykier <niels at thykier.net>  Sun, 12 Nov 2017 09:55:24 +0000
 
 debhelper (10.10.7) unstable; urgency=medium
diff --git a/lib/Debian/Debhelper/Buildsystem/qmake.pm b/lib/Debian/Debhelper/Buildsystem/qmake.pm
index 2deda36..6e4f874 100644
--- a/lib/Debian/Debhelper/Buildsystem/qmake.pm
+++ b/lib/Debian/Debhelper/Buildsystem/qmake.pm
@@ -99,10 +99,11 @@ sub configure {
 		}
 		if ($ENV{CXX}) {
 			push @flags, "QMAKE_CXX=" . $ENV{CXX};
+			push @flags, "QMAKE_LINK=" . $ENV{CXX};
 		} else {
 			push @flags, "QMAKE_CXX=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-g++";
+			push @flags, "QMAKE_LINK=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-g++";
 		}
-		push @flags, "QMAKE_LINK=\$(CXX)";
 		push @flags, "PKG_CONFIG=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-pkg-config";
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git