1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pass --sysroot to compile tests also on windows

Browse Source 
Change-Id: I486059197479842f32c3590d7fd269550d22698e
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-07-02 14:43:18 +02:00
parent ae496a0ea6
commit ffd44acd0d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/configure/configureapp.cpp
View File

@ -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 { struct ArchData {
bool isHost; bool isHost;
const char *qmakespec; const char *qmakespec;
@ -3142,6 +3151,7 @@ void Configure::detectArch()
if (!data.isHost) { if (!data.isHost) {
if (qmakespec.startsWith("winrt") || qmakespec.startsWith("winphone")) if (qmakespec.startsWith("winrt") || qmakespec.startsWith("winphone"))
command.append(" QMAKE_LFLAGS+=/ENTRY:main"); command.append(" QMAKE_LFLAGS+=/ENTRY:main");
addSysroot(&command);
} }
int returnValue = 0; int returnValue = 0;
@ -3249,6 +3259,7 @@ bool Configure::tryCompileProject(const QString &projectPath, const QString &ext
const QString qmakespec = dictionary["XQMAKESPEC"]; const QString qmakespec = dictionary["XQMAKESPEC"];
if (qmakespec.startsWith("winrt") || qmakespec.startsWith("winphone")) if (qmakespec.startsWith("winrt") || qmakespec.startsWith("winphone"))
command.append(" QMAKE_LFLAGS+=/ENTRY:main"); command.append(" QMAKE_LFLAGS+=/ENTRY:main");
addSysroot(&command);
} }
int code = 0; int code = 0;

1
tools/configure/configureapp.h
View File

@ -169,6 +169,7 @@ private:
void reloadCmdLine(); void reloadCmdLine();
void saveCmdLine(); void saveCmdLine();
void addSysroot(QString *command);
bool tryCompileProject(const QString &projectPath, const QString &extraOptions = QString()); bool tryCompileProject(const QString &projectPath, const QString &extraOptions = QString());
bool compilerSupportsFlag(const QString &compilerAndArgs); bool compilerSupportsFlag(const QString &compilerAndArgs);