summaryrefslogtreecommitdiffstats
path: root/config.tests/arch/arch.pro
Commit message (Collapse)AuthorAgeFilesLines
* Disable app_bundle and lib_bundle when running configure testsTor Arne Vestbø2013-07-161-1/+0
| | | | | | | Just like configure.prf. Change-Id: I760e0ca5bec41b3befb738a8a7a468e8f1a15946 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Ensure that arch.test for host runs with option(host_build)Tor Arne Vestbø2013-02-181-0/+1
| | | | | | | | | So that mkspecs and features may rely on the host_build test. Change-Id: I18fee4820d9e2904285afcc7ddb8f1cc3d025fef Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Improve the architecture-detection mechanismThiago Macieira2012-05-301-7/+4
| | | | | | | | | | | | | | For the Unix part, this now obeys the -v option, printing the full command-line it used to compile, allowing testers to identify why something went wrong. Unfortunately, it requires a full compilation cycle, instead of just preprocessing. Just one more among the many on Unix, but maybe a noticeable slow-down on Windows. Change-Id: I654b70d99887e04c96731a5b91be9ad555e4d8fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Make architecture detection more robust.Girish Ramakrishnan2012-03-221-2/+2
| | | | | | | | | Any message/error in mkspecs or qmake feature files ends up confusing the current arch detection logic. Instead, search for "Project MESSAGE: .* Architecture: <arch>". Change-Id: I308932a5b75f3a1fcbc4fe30c74faf2e83b2d752 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove -arch argument and #define QT_ARCH from configuresBradley T. Hughes2012-03-131-0/+7
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>