diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2023-02-03 09:12:31 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-07 11:52:37 +0000 |
| commit | 9c7b1136f7c0bb74d4e157b1ed34e17e0fcb87ea (patch) | |
| tree | 181fcc070f8409ca4c3fe6f0e6d6c11aa1ca41f1 | |
| parent | 86520a557aa992236a9335b976e10b75dbaa96f2 (diff) | |
qbsp: add option to force docker toolchain
Environment variable FORCE_CONTAINER_TOOLCHAIN can be used when
installing a QBSP on linux to for it's installation as a container
toolchain instead of native toolchain.
Change-Id: I407010b550e041e0f1fe052a09d420af4d3ab475
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8b95fc2781d8d48ca6692c9b94b48070a3404e3d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | meta-boot2qt/files/qbsp/toolchain_installscript.qs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs index c52cdda5..659009f1 100644 --- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs +++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs @@ -48,7 +48,7 @@ Component.prototype.createOperations = function() var dockerPrefix = ""; var container = false; - if ( "@TOOLCHAIN_HOST_TYPE@" == "linux" && systemInfo.kernelType !== "linux" || @FORCE_CONTAINER_TOOLCHAIN@) + if ("@TOOLCHAIN_HOST_TYPE@" == "linux" && systemInfo.kernelType !== "linux" || @FORCE_CONTAINER_TOOLCHAIN@ || installer.environmentVariable("FORCE_CONTAINER_TOOLCHAIN")) container = true; var path = installer.value("TargetDir") + installPath; |