From ffd44acd0de4fc7079e76f1fe4689b655f9dc763 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 2 Jul 2014 14:43:18 +0200 Subject: pass --sysroot to compile tests also on windows Change-Id: I486059197479842f32c3590d7fd269550d22698e Reviewed-by: David Schulz Reviewed-by: Oliver Wolff Reviewed-by: Joerg Bornemann --- tools/configure/configureapp.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'tools/configure/configureapp.cpp') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 76b2b9073c..90981f6624 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3089,6 +3089,15 @@ void Configure::generateCachefile() } } +void Configure::addSysroot(QString *command) +{ + const QString &sysroot = dictionary["CFG_SYSROOT"]; + if (!sysroot.isEmpty() && dictionary["CFG_GCC_SYSROOT"] == "yes") { + command->append(" QMAKE_LFLAGS+=--sysroot=" + sysroot); + command->append(" QMAKE_CXXFLAGS+=--sysroot=" + sysroot); + } +} + struct ArchData { bool isHost; const char *qmakespec; @@ -3142,6 +3151,7 @@ void Configure::detectArch() if (!data.isHost) { if (qmakespec.startsWith("winrt") || qmakespec.startsWith("winphone")) command.append(" QMAKE_LFLAGS+=/ENTRY:main"); + addSysroot(&command); } int returnValue = 0; @@ -3249,6 +3259,7 @@ bool Configure::tryCompileProject(const QString &projectPath, const QString &ext const QString qmakespec = dictionary["XQMAKESPEC"]; if (qmakespec.startsWith("winrt") || qmakespec.startsWith("winphone")) command.append(" QMAKE_LFLAGS+=/ENTRY:main"); + addSysroot(&command); } int code = 0; -- cgit v1.2.3