diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-10-15 10:40:06 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-15 11:06:05 +0200 |
| commit | 96c6199f74d4e60cb568426edd07fc7596d802c6 (patch) | |
| tree | 710954c5dd9ac47194e34dbf1887ab2e4be1a7d3 /share/qbs/modules | |
| parent | c8b795532c5b5fa0752e218ab5b75c1569a2c5c1 (diff) | |
| download | qbs-96c6199f74d4e60cb568426edd07fc7596d802c6.tar.gz | |
temporarily weaken the architecture check in common.qbs
ATM, no MSVC profile has qbs.architecture set. That's why the test
machines run amok now.
Change-Id: I1d0fa049d500d47d7deb58237c372ef13f47faf2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'share/qbs/modules')
| -rw-r--r-- | share/qbs/modules/qbs/common.qbs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs index bd77c15b8..6b9a35f76 100644 --- a/share/qbs/modules/qbs/common.qbs +++ b/share/qbs/modules/qbs/common.qbs @@ -39,6 +39,9 @@ Module { } validate: { + if (!architecture) // ### remove and replace with suggestion to re-run detect-toolchains, + return; // once QBS-404 is fixed + var architectureSynonyms = { "x86": ["i386", "i486", "i586", "i686", "ia32", "ia-32", "x86_32", "x86-32", "intel32"], "x86_64": ["x86-64", "x64", "amd64", "ia32e", "em64t", "intel64"], |