diff options
| author | Dan Ackers <dan.ackers@qt.io> | 2021-09-10 10:32:28 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-28 22:32:01 +0000 |
| commit | 8504d78c96177bf41ae5e561ffc97077a6bca967 (patch) | |
| tree | 6fd0c6533e001be377846809d6865878466b13e4 | |
| parent | 04f7a702916e6f965ac451e1fa3a819b21e531be (diff) | |
Make QNX-toolchain files git-tracked
Also, qnx now builds only using toolchain
packages, ignoring host mahcine.
Task-number: QTQAINFRA-4502
Change-Id: Ifd2f3cf1260b92cee8040e1d2213809bad1b3fc1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 80d0b2a91bca5ef0938eebb709e1c5263684f355)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
4 files changed, 82 insertions, 5 deletions
diff --git a/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake b/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake new file mode 100644 index 00000000..3e3ee6e8 --- /dev/null +++ b/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake @@ -0,0 +1,25 @@ +set(CMAKE_SYSTEM_NAME QNX) + +if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +endif() +if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +endif() +if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) +endif() +if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET}/target/qnx7/) + +set(_qnx_toolchain_arch gcc_ntoaarch64le) + +set(CMAKE_C_COMPILER qcc) +set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch}) +set(CMAKE_CXX_COMPILER q++) +set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch}) + +set(CMAKE_SYSROOT $ENV{QNX_TARGET}) diff --git a/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-armv7le.cmake b/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-armv7le.cmake new file mode 100644 index 00000000..b441859a --- /dev/null +++ b/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-armv7le.cmake @@ -0,0 +1,25 @@ +set(CMAKE_SYSTEM_NAME QNX) + +if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +endif() +if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +endif() +if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) +endif() +if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET}/target/qnx7/) + +set(_qnx_toolchain_arch gcc_ntoarmv7le) + +set(CMAKE_C_COMPILER qcc) +set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch}) +set(CMAKE_CXX_COMPILER q++) +set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch}) + +set(CMAKE_SYSROOT $ENV{QNX_TARGET}) diff --git a/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-x8664.cmake b/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-x8664.cmake new file mode 100644 index 00000000..bec28b06 --- /dev/null +++ b/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-x8664.cmake @@ -0,0 +1,25 @@ +set(CMAKE_SYSTEM_NAME QNX) + +if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +endif() +if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +endif() +if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) +endif() +if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET}/target/qnx7/) + +set(_qnx_toolchain_arch gcc_ntox86_64) + +set(CMAKE_C_COMPILER qcc) +set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch}) +set(CMAKE_CXX_COMPILER q++) +set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch}) + +set(CMAKE_SYSROOT $ENV{QNX_TARGET}) diff --git a/coin/provisioning/common/linux/qnx_710.sh b/coin/provisioning/common/linux/qnx_710.sh index fef7cffc..87399d0f 100755 --- a/coin/provisioning/common/linux/qnx_710.sh +++ b/coin/provisioning/common/linux/qnx_710.sh @@ -54,6 +54,10 @@ DownloadAndExtract () { rm -rf $file } +aarch64le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake" +armv7le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-armv7le.cmake" +x8664_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-x8664.cmake" + targetFolder="/opt/" folderName="qnx710" targetPath="$targetFolder$folderName" @@ -68,11 +72,9 @@ targetFile="qnx710.tar.xz" sha1="fa9eb0f4247504a546cb014784646847eb6c8114" DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder" -# Toolchain files -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx-toolchains.tar.xz" -targetFile="qnx-toolchains.tar.xz" -sha1="d8a97605d80a2296f98caba3854557ca0dd5d7d3" -DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetPath" +sudo cp $aarch64le_toolchain $targetPath +sudo cp $armv7le_toolchain $targetPath +sudo cp $x8664_toolchain $targetPath sudo chown -R qt:users "$targetPath" |