[debhelper-devel] [debhelper] 01/02: qmake.pm: Push compiler information as ‘early’ flags to qmake.

[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 5f21fa3a1fcc95804581dbaee6050e07c956175b
Author: Dmitry Shachnev <mitya57 at debian.org>
Date:   Fri Nov 17 11:10:27 2017 +0300

    qmake.pm: Push compiler information as ‘early’ flags to qmake.
    
    To make sure qmake calls the right compiler to get library paths.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog                          | 2 ++
 lib/Debian/Debhelper/Buildsystem/qmake.pm | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2ded6e5..76702c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ debhelper (10.10.9) UNRELEASED; urgency=medium
   * qmake.pm: Add missing import of generated_file.
   * meson.pm: Find typo of meson in the name of the cross config
     file.
+  * qmake.pm: Push compiler information as ‘early’ flags to qmake, to
+    make sure qmake calls the right compiler to get library paths.
 
  -- Niels Thykier <niels at thykier.net>  Thu, 16 Nov 2017 18:36:51 +0000
 
diff --git a/lib/Debian/Debhelper/Buildsystem/qmake.pm b/lib/Debian/Debhelper/Buildsystem/qmake.pm
index cdc5205..564c755 100644
--- a/lib/Debian/Debhelper/Buildsystem/qmake.pm
+++ b/lib/Debian/Debhelper/Buildsystem/qmake.pm
@@ -99,6 +99,9 @@ sub configure {
 	push @flags, "PREFIX=/usr";
 
 	if (is_cross_compiling()) {
+		# qmake calls $$QMAKE_CXX in toolchain.prf to get a list of library/include paths,
+		# we need -early flag to make sure $$QMAKE_CXX is already properly set on that step.
+		push @flags, "-early";
 		if ($ENV{CC}) {
 			push @flags, "QMAKE_CC=" . $ENV{CC};
 		} else {

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