From f82829a1a2970af68adc379fa52f8a7411f59013 Mon Sep 17 00:00:00 2001 From: Tuomas Vaarala Date: Wed, 15 Jan 2025 13:07:55 +0200 Subject: [PATCH] Set CMAKE_OBJCOPY for QNX builds in toolchain file Fixes: QTBUG-132801 Pick-to: 6.8 6.9 Change-Id: I9b68ac60cc540524c789fad7af0107b8b023af8e Reviewed-by: Alexandru Croitor --- .../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake | 1 + .../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake | 1 + .../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake | 1 + 3 files changed, 3 insertions(+) diff --git a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake index d787d555..1ceca7c5 100644 --- a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake +++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake @@ -25,5 +25,6 @@ set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch}) set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntoaarch64-strip) set(CMAKE_AR $ENV{QNX_HOST}/usr/bin/ntoaarch64-ar) +set(CMAKE_OBJCOPY $ENV{QNX_HOST}/usr/bin/ntoaarch64-objcopy) set(CMAKE_SYSROOT $ENV{QNX_TARGET}) diff --git a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake index d270530b..5bbdd1db 100644 --- a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake +++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake @@ -25,5 +25,6 @@ set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch}) set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntoarmv7-strip) set(CMAKE_AR $ENV{QNX_HOST}/usr/bin/ntoarmv7-ar) +set(CMAKE_OBJCOPY $ENV{QNX_HOST}/usr/bin/ntoarmv7-objcopy) set(CMAKE_SYSROOT $ENV{QNX_TARGET}) diff --git a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake index a7bb7b5e..a8316041 100644 --- a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake +++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake @@ -25,5 +25,6 @@ set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch}) set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntox86_64-strip) set(CMAKE_AR $ENV{QNX_HOST}/usr/bin/ntox86_64-ar) +set(CMAKE_OBJCOPY $ENV{QNX_HOST}/usr/bin/ntox86_64-objcopy) set(CMAKE_SYSROOT $ENV{QNX_TARGET})