From dc7adb64f38464d22b29d9bd314ba9807173dbfe Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Wed, 30 Jul 2025 17:11:11 -0400
Subject: [PATCH 1/2] QCC-CXX: use `-x c++` on 8+

The `-lang-c++` flag has been deprecated.
---
 Modules/Compiler/QCC-CXX.cmake | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Modules/Compiler/QCC-CXX.cmake b/Modules/Compiler/QCC-CXX.cmake
index 0716af7a27..19a04af744 100644
--- a/Modules/Compiler/QCC-CXX.cmake
+++ b/Modules/Compiler/QCC-CXX.cmake
@@ -6,10 +6,18 @@ __compiler_qcc(CXX)
 
 # If the toolchain uses qcc for CMAKE_CXX_COMPILER instead of QCC, the
 # default for the driver is not c++.
+if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.2.0") # QNX 8.0 toolchain
+  set(_cmake_qcc_cxx_lang_compile_flag "-lang-c++")
+  set(_cmake_qcc_cxx_lang_link_flag "-lang-c++")
+else ()
+  set(_cmake_qcc_cxx_lang_compile_flag "-x c++")
+  set(_cmake_qcc_cxx_lang_link_flag "")
+endif ()
 set(CMAKE_CXX_COMPILE_OBJECT
-  "<CMAKE_CXX_COMPILER> -lang-c++ <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")
-
+  "<CMAKE_CXX_COMPILER> ${_cmake_qcc_cxx_lang_compile_flag} <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")
 set(CMAKE_CXX_LINK_EXECUTABLE
-  "<CMAKE_CXX_COMPILER> -lang-c++ <FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+  "<CMAKE_CXX_COMPILER> ${_cmake_qcc_cxx_lang_link_flag} <FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+unset(_cmake_qcc_cxx_lang_compile_flag)
+unset(_cmake_qcc_cxx_lang_link_flag)
 
 set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")

From 166061629a1109dff42c9f2966b972ebe5be98ba Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Wed, 30 Jul 2025 17:11:11 -0400
Subject: [PATCH 2/2] QCC-CXX: use `-x c++` on 8+

The `-lang-c++` flag has been deprecated.
---
 Modules/Compiler/QCC-CXX.cmake | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Modules/Compiler/QCC-CXX.cmake b/Modules/Compiler/QCC-CXX.cmake
index 42303f4e70..406e58230d 100644
--- a/Modules/Compiler/QCC-CXX.cmake
+++ b/Modules/Compiler/QCC-CXX.cmake
@@ -6,10 +6,18 @@ __compiler_qcc(CXX)
 
 # If the toolchain uses qcc for CMAKE_CXX_COMPILER instead of QCC, the
 # default for the driver is not c++.
+if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.2.0") # QNX 8.0 toolchain
+  set(_cmake_qcc_cxx_lang_compile_flag "-lang-c++")
+  set(_cmake_qcc_cxx_lang_link_flag "-lang-c++")
+else ()
+  set(_cmake_qcc_cxx_lang_compile_flag "-x c++")
+  set(_cmake_qcc_cxx_lang_link_flag "")
+endif ()
 set(CMAKE_CXX_COMPILE_OBJECT
-  "<CMAKE_CXX_COMPILER> -lang-c++ <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")
-
+  "<CMAKE_CXX_COMPILER> ${_cmake_qcc_cxx_lang_compile_flag} <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")
 set(CMAKE_CXX_LINK_EXECUTABLE
-  "<CMAKE_CXX_COMPILER> -lang-c++ <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+  "<CMAKE_CXX_COMPILER> ${_cmake_qcc_cxx_lang_link_flag} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+unset(_cmake_qcc_cxx_lang_compile_flag)
+unset(_cmake_qcc_cxx_lang_link_flag)
 
 set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")