aboutsummaryrefslogtreecommitdiffstats
path: root/meta-boot2qt
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2023-02-03 09:12:31 +0000
committerSamuli Piippo <samuli.piippo@qt.io>2023-02-07 09:14:18 +0000
commit8b95fc2781d8d48ca6692c9b94b48070a3404e3d (patch)
treec678d6ad51d36117135ebe89ad72a11b6ec12be8 /meta-boot2qt
parent3ea22d8e1447f4a6bfd05e9c9ebd40741a0f1f29 (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. Pick-to: 6.5 Change-Id: I407010b550e041e0f1fe052a09d420af4d3ab475 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt')
-rw-r--r--meta-boot2qt/files/qbsp/toolchain_installscript.qs2
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;