diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-17 17:28:06 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-18 07:32:12 +0000 |
| commit | 6eb7f87bc37eb95d98aaa103a2a20bbfaa408c98 (patch) | |
| tree | c44302bb36bd26e62d7b214f0a8fdc5ff047bc13 | |
| parent | b7ccfd3c107e2edc3823cd79cf67d8e4e34f668b (diff) | |
avoid race condition in modular x-builds
the first load of toolchain.prf for the host needs to be serialized.
qtattributionsscanner was chosen as the "anchor" because it's always
built and it's small (so the serialization doesn't hurt too much).
Change-Id: Iae1446ff92f1189d522fe85ab3e645cdc2c5a56b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/src.pro | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/src.pro b/src/src.pro index db6fe0c3b..0ef1d0284 100644 --- a/src/src.pro +++ b/src/src.pro @@ -38,3 +38,13 @@ qtNomakeTools( \ pixeltool \ macdeployqt \ ) + +# This is necessary to avoid a race condition between toolchain.prf +# invocations in a module-by-module cross-build. +cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { + androiddeployqt.depends += qtattributionsscanner + qdoc.depends += qtattributionsscanner + windeployqt.depends += qtattributionsscanner + winrtrunner.depends += qtattributionsscanner + linguist.depends += qtattributionsscanner +} |