ba6952b28d
Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
121 lines
3.3 KiB
C++
121 lines
3.3 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/
|
|
**
|
|
** This file is part of the tools applications of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
|
** GNU Lesser General Public License Usage
|
|
** This file may be used under the terms of the GNU Lesser General Public
|
|
** License version 2.1 as published by the Free Software Foundation and
|
|
** appearing in the file LICENSE.LGPL included in the packaging of this
|
|
** file. Please review the following information to ensure the GNU Lesser
|
|
** General Public License version 2.1 requirements will be met:
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Nokia gives you certain additional
|
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU General
|
|
** Public License version 3.0 as published by the Free Software Foundation
|
|
** and appearing in the file LICENSE.GPL included in the packaging of this
|
|
** file. Please review the following information to ensure the GNU General
|
|
** Public License version 3.0 requirements will be met:
|
|
** http://www.gnu.org/copyleft/gpl.html.
|
|
**
|
|
** Other Usage
|
|
** Alternatively, this file may be used in accordance with the terms and
|
|
** conditions contained in a signed written agreement between you and Nokia.
|
|
**
|
|
**
|
|
**
|
|
**
|
|
**
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
/*
|
|
** Configure tool
|
|
**
|
|
*/
|
|
|
|
#include "configureapp.h"
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
int runConfigure( int argc, char** argv )
|
|
{
|
|
Configure app( argc, argv );
|
|
if (!app.isOk())
|
|
return 3;
|
|
|
|
app.parseCmdLine();
|
|
#if !defined(EVAL)
|
|
app.validateArgs();
|
|
#endif
|
|
if( app.displayHelp() )
|
|
return 1;
|
|
|
|
// Read license now, and exit if it doesn't pass.
|
|
// This lets the user see the command-line options of configure
|
|
// without having to load and parse the license file.
|
|
app.readLicense();
|
|
if (!app.isOk())
|
|
return 3;
|
|
|
|
// Auto-detect modules and settings.
|
|
app.autoDetection();
|
|
|
|
// After reading all command-line arguments, and doing all the
|
|
// auto-detection, it's time to do some last minute validation.
|
|
// If the validation fails, we cannot continue.
|
|
if (!app.verifyConfiguration())
|
|
return 3;
|
|
|
|
app.generateOutputVars();
|
|
|
|
#if !defined(EVAL)
|
|
if( !app.isDone() )
|
|
app.generateCachefile();
|
|
if( !app.isDone() )
|
|
app.generateBuildKey();
|
|
if( !app.isDone() )
|
|
app.generateConfigfiles();
|
|
if( !app.isDone() )
|
|
app.generateHeaders();
|
|
if( !app.isDone() )
|
|
app.buildQmake();
|
|
// must be done after buildQmake()
|
|
if (!app.isDone())
|
|
app.detectArch();
|
|
// must be done after detectArch()
|
|
if (!app.isDone())
|
|
app.generateQConfigPri();
|
|
if (!app.isDone())
|
|
app.displayConfig();
|
|
#endif
|
|
if( !app.isDone() )
|
|
app.generateMakefiles();
|
|
if( !app.isDone() )
|
|
app.buildHostTools();
|
|
if( !app.isDone() )
|
|
app.showSummary();
|
|
if( !app.isOk() )
|
|
return 2;
|
|
|
|
return 0;
|
|
}
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
int main( int argc, char** argv )
|
|
{
|
|
QT_USE_NAMESPACE
|
|
return runConfigure(argc, argv);
|
|
}
|