From cb3fa988846cd7a3e7f4a8cc3f615d8efaf25c16 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 19 Sep 2023 12:18:38 +0200
Subject: [PATCH 1/2] QNX changes

    * ACE/include/makeinclude/platform_qnx_gcc.GNU:
---
 ACE/include/makeinclude/platform_qnx_gcc.GNU | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ACE/include/makeinclude/platform_qnx_gcc.GNU b/ACE/include/makeinclude/platform_qnx_gcc.GNU
index 71736988bee49..79952c7798665 100644
--- a/ACE/include/makeinclude/platform_qnx_gcc.GNU
+++ b/ACE/include/makeinclude/platform_qnx_gcc.GNU
@@ -6,6 +6,7 @@ debug ?= 1
 optimize ?= 0
 threads ?= 1
 pipes ?= 0
+c++std ?= gnu++14
 
 CCFLAGS += -fexceptions
 LDFLAGS += -fexceptions
@@ -16,6 +17,7 @@ else
 CCFLAGS += -fno-inline
 endif # inline
 
+CCFLAGS  += -fno-builtin
 DCFLAGS  += -ggdb
 DCCFLAGS += -ggdb
 
@@ -23,8 +25,10 @@ ifeq ($(optimize),1)
 OCFLAGS += -O3
 endif #optimize
 
-DLD     = $(CXX)
-LD      = $(CXX)
+CC ?= qcc
+CXX ?= q++
+DLD = $(CXX)
+LD = $(CXX)
 
 LIBS    += -lsocket -lstdc++ -lm
 

From 1e2da3173a498909230f3f12617e663c5aa20190 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 19 Sep 2023 13:49:41 +0200
Subject: [PATCH 2/2] Remove not needed line

    * ACE/include/makeinclude/platform_qnx_gcc.GNU:
---
 ACE/include/makeinclude/platform_qnx_gcc.GNU | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ACE/include/makeinclude/platform_qnx_gcc.GNU b/ACE/include/makeinclude/platform_qnx_gcc.GNU
index 79952c7798665..0912ee9d27310 100644
--- a/ACE/include/makeinclude/platform_qnx_gcc.GNU
+++ b/ACE/include/makeinclude/platform_qnx_gcc.GNU
@@ -17,7 +17,6 @@ else
 CCFLAGS += -fno-inline
 endif # inline
 
-CCFLAGS  += -fno-builtin
 DCFLAGS  += -ggdb
 DCCFLAGS += -ggdb