Skip to content

Commit d1876b5

Browse files
committed
Minor fixes in crosscompiling toolchains.
1 parent 911737d commit d1876b5

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

toolbox/overlay-triplets/qnx-toolchain.cmake

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ set(CMAKE_CXX_COMPILER_TARGET ${QNX_QCC_VARIANT})
4040
# $QNX_TARGET/aarch64le
4141
# $QNX_TARGET/armle-v7
4242
# $QNX_TARGET/x86_64
43-
set(CMAKE_SYSROOT "$ENV{QNX_TARGET}" CACHE PATH "")
44-
set(CMAKE_FIND_ROOT_PATH "${CMAKE_SYSROOT}" CACHE PATH "")
43+
set(CMAKE_SYSROOT $ENV{QNX_TARGET} CACHE PATH "")
44+
set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT} CACHE PATH "")
45+
46+
# Add additional paths
4547
set(CMAKE_PREFIX_PATH ${CMAKE_SYSROOT}/${QNX_SYSROOT_SUFFIX}; ${CMAKE_SYSROOT}/${QNX_SYSROOT_SUFFIX}/usr)
4648

4749
# Host tools only (executables used during configure/build)
@@ -52,15 +54,12 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
5254
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
5355
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
5456

55-
# Avoid try_run / executable checks during configuration on a cross build.
56-
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
57-
5857
# Optional: if some projects try to use GNU ar/ranlib/nm directly, point to QNX tools
5958
# But usually qcc/q++ + -V variant is enough.
6059
# set(CMAKE_AR "nto${QNX_SYSROOT_SUFFIX}-ar")
6160
# set(CMAKE_RANLIB "nto${QNX_SYSROOT_SUFFIX}-ranlib")
6261
# set(CMAKE_NM "nto${QNX_SYSROOT_SUFFIX}-nm")
6362

64-
# QNX doesnt use glibc; some ports may need feature tests or POSIX settings.
63+
# QNX doesn't use glibc; some ports may need feature tests or POSIX settings.
6564
add_compile_definitions(_QNX_SOURCE)
66-
add_compile_definitions(__GNU__)
65+
add_compile_definitions(__GNU__)

toolbox/overlay-triplets/speedgoat-linux-toolchain.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ set(CMAKE_CXX_COMPILER ${CMAKE_SYSTEM_PROCESSOR}-speedgoat-linux-g++ CACHE FILEP
2828

2929
# Sysroot
3030
string(REPLACE "\"" "" SDKTARGETSYSROOT "$ENV{SDKTARGETSYSROOT}")
31-
set(CMAKE_SYSROOT "${SDKTARGETSYSROOT}" CACHE PATH ")
32-
set(CMAKE_FIND_ROOT_PATH "${CMAKE_SYSROOT}" CACHE PATH "")
31+
set(CMAKE_SYSROOT ${SDKTARGETSYSROOT} CACHE PATH "")
32+
set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT} CACHE PATH "")
3333

3434
# Optimize for target architecture
3535
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
@@ -50,4 +50,3 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
5050

5151
# Avoid try_run / executable checks during configuration on a cross build.
5252
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
53-

0 commit comments

Comments
 (0)