diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2023-01-18 09:38:07 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-31 08:31:54 +0000 |
| commit | fdd7d3c73bcf41d6c45312334e300b7920aa0bf5 (patch) | |
| tree | 871b7858f9cbeedda7d827890ba55aa4ae8e8d2b | |
| parent | a6a88ddb70f1a029c34a265f48d4b15934d99d5d (diff) | |
qbsp: add mkspec to container toolchain kit
QtCreator has been fixed, so mkspec can be added also to container
toolchain. Also use empty build device for non-container toolchain,
which defaults to desktop device. This allows simpler installer
script to be maintained.
Change-Id: I249b8ee56fc4e4600c85c668ae2addf33c4c2686
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 5e92c0eaf453885ae0958bc48845732a76bab528)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | meta-boot2qt/files/qbsp/toolchain_installscript.qs | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs index 696ee929..c52cdda5 100644 --- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs +++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs @@ -144,7 +144,9 @@ RUN sh *.sh -d /opt/toolchain -y && rm *.sh\n"); "UNDOEXECUTE", "@SDKToolBinary@", "rmCMake", "--id", component.name]); + var deviceId = ""; if (container) { + deviceId = component.name; component.addOperation("Execute", ["@SDKToolBinary@", "addDev", "--id", component.name, @@ -159,14 +161,16 @@ RUN sh *.sh -d /opt/toolchain -y && rm *.sh\n"); "@SDKToolBinary@", "rmDev", "--id", component.name]); } - var addKitOperations = + component.addOperation("Execute", ["@SDKToolBinary@", "addKit", "--id", component.name, "--name", platform, + "--mkspec", "linux-oe-g++", "--qt", component.name, "--debuggerid", component.name, "--sysroot", path + "/sysroots/" + sysroot, "--devicetype", "QdbLinuxOsType", + "--builddevice", deviceId, "--Ctoolchain", toolchainId + ".gcc", "--Cxxtoolchain", toolchainId + ".g++", "--cmake", component.name, @@ -176,17 +180,9 @@ RUN sh *.sh -d /opt/toolchain -y && rm *.sh\n"); "--cmake-config", "CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}", "--cmake-config", "QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}", "--cmake-config", "CMAKE_TOOLCHAIN_FILE:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/lib/cmake/Qt6/qt.toolchain.cmake", - "--cmake-config", "CMAKE_MAKE_PROGRAM:FILEPATH=" + path + "/sysroots/"+ hostSysroot + "/usr/bin/ninja" + executableExt]; - - if (container) { - addKitOperations.push("--builddevice", component.name); - } - if (!container) { - addKitOperations.push("--mkspec", "linux-oe-g++"); - } - - addKitOperations.push("UNDOEXECUTE", "@SDKToolBinary@", "rmKit", "--id", component.name); - component.addOperation("Execute", addKitOperations); + "--cmake-config", "CMAKE_MAKE_PROGRAM:FILEPATH=" + path + "/sysroots/"+ hostSysroot + "/usr/bin/ninja" + executableExt, + "UNDOEXECUTE", + "@SDKToolBinary@", "rmKit", "--id", component.name]); if (container) { var settingsFile = installer.value("QtCreatorInstallerSettingsFile"); |