From 514b9eb496f4b1de44c6a65a03086121f489a699 Mon Sep 17 00:00:00 2001
From: kaidegit <2857693944@qq.com>
Date: Tue, 1 Sep 2026 22:13:56 +0800
Subject: [PATCH] [bsp][hpmicro] wire CXX/CXXFLAGS from rtconfig into scons
 Environment

Without CXX = rtconfig.CXX the scons Environment falls back to the
default host 'g++', and CXXFLAGS stays an empty CLVar, so the C++
group flags appended by DefineGroup end up as a single unquoted
argument and the build fails as soon as RT_USING_CPLUSPLUS is on:

  g++: error:  -fno-exceptions -fno-rtti ... -Wl,--gc-sections:
  linker input file not found: No such file or directory

Found by the CI C++ ctor (.init_array) check.
---
 bsp/hpmicro/hpm5300evk/SConstruct     | 1 +
 bsp/hpmicro/hpm5301evklite/SConstruct | 1 +
 bsp/hpmicro/hpm5e00evk/SConstruct     | 1 +
 bsp/hpmicro/hpm6200evk/SConstruct     | 1 +
 bsp/hpmicro/hpm6300evk/SConstruct     | 1 +
 bsp/hpmicro/hpm6750evk/SConstruct     | 1 +
 bsp/hpmicro/hpm6750evk2/SConstruct    | 1 +
 bsp/hpmicro/hpm6750evkmini/SConstruct | 1 +
 bsp/hpmicro/hpm6800evk/SConstruct     | 1 +
 bsp/hpmicro/hpm6e00evk/SConstruct     | 1 +
 bsp/hpmicro/hpm6p00evk/SConstruct     | 1 +
 11 files changed, 11 insertions(+)

diff --git a/bsp/hpmicro/hpm5300evk/SConstruct b/bsp/hpmicro/hpm5300evk/SConstruct
index cb5ef4ab2a2f..601a33ec9183 100644
--- a/bsp/hpmicro/hpm5300evk/SConstruct
+++ b/bsp/hpmicro/hpm5300evk/SConstruct
@@ -46,6 +46,7 @@ DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
     CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS,
     CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES')
diff --git a/bsp/hpmicro/hpm5301evklite/SConstruct b/bsp/hpmicro/hpm5301evklite/SConstruct
index 7aba1a759850..d41dbd7584a1 100644
--- a/bsp/hpmicro/hpm5301evklite/SConstruct
+++ b/bsp/hpmicro/hpm5301evklite/SConstruct
@@ -46,6 +46,7 @@ DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
     CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS,
     CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES')
diff --git a/bsp/hpmicro/hpm5e00evk/SConstruct b/bsp/hpmicro/hpm5e00evk/SConstruct
index 7aba1a759850..d41dbd7584a1 100644
--- a/bsp/hpmicro/hpm5e00evk/SConstruct
+++ b/bsp/hpmicro/hpm5e00evk/SConstruct
@@ -46,6 +46,7 @@ DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
     CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS,
     CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES')
diff --git a/bsp/hpmicro/hpm6200evk/SConstruct b/bsp/hpmicro/hpm6200evk/SConstruct
index 5f773328f5ed..d48a9a0956c3 100644
--- a/bsp/hpmicro/hpm6200evk/SConstruct
+++ b/bsp/hpmicro/hpm6200evk/SConstruct
@@ -46,6 +46,7 @@ DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
     CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS,
     CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES')
diff --git a/bsp/hpmicro/hpm6300evk/SConstruct b/bsp/hpmicro/hpm6300evk/SConstruct
index 5f773328f5ed..d48a9a0956c3 100644
--- a/bsp/hpmicro/hpm6300evk/SConstruct
+++ b/bsp/hpmicro/hpm6300evk/SConstruct
@@ -46,6 +46,7 @@ DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
     CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS,
     CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES')
diff --git a/bsp/hpmicro/hpm6750evk/SConstruct b/bsp/hpmicro/hpm6750evk/SConstruct
index 5f773328f5ed..d48a9a0956c3 100644
--- a/bsp/hpmicro/hpm6750evk/SConstruct
+++ b/bsp/hpmicro/hpm6750evk/SConstruct
@@ -46,6 +46,7 @@ DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
     CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS,
     CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES')
diff --git a/bsp/hpmicro/hpm6750evk2/SConstruct b/bsp/hpmicro/hpm6750evk2/SConstruct
index 5f773328f5ed..d48a9a0956c3 100644
--- a/bsp/hpmicro/hpm6750evk2/SConstruct
+++ b/bsp/hpmicro/hpm6750evk2/SConstruct
@@ -46,6 +46,7 @@ DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
     CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS,
     CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES')
diff --git a/bsp/hpmicro/hpm6750evkmini/SConstruct b/bsp/hpmicro/hpm6750evkmini/SConstruct
index 5f773328f5ed..d48a9a0956c3 100644
--- a/bsp/hpmicro/hpm6750evkmini/SConstruct
+++ b/bsp/hpmicro/hpm6750evkmini/SConstruct
@@ -46,6 +46,7 @@ DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
     CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS,
     CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES')
diff --git a/bsp/hpmicro/hpm6800evk/SConstruct b/bsp/hpmicro/hpm6800evk/SConstruct
index 5f773328f5ed..d48a9a0956c3 100644
--- a/bsp/hpmicro/hpm6800evk/SConstruct
+++ b/bsp/hpmicro/hpm6800evk/SConstruct
@@ -46,6 +46,7 @@ DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
     CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS,
     CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES')
diff --git a/bsp/hpmicro/hpm6e00evk/SConstruct b/bsp/hpmicro/hpm6e00evk/SConstruct
index d7c295d1c749..11f8073bd4c8 100644
--- a/bsp/hpmicro/hpm6e00evk/SConstruct
+++ b/bsp/hpmicro/hpm6e00evk/SConstruct
@@ -29,6 +29,7 @@ DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
     CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS,
     CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES')
diff --git a/bsp/hpmicro/hpm6p00evk/SConstruct b/bsp/hpmicro/hpm6p00evk/SConstruct
index 5f773328f5ed..d48a9a0956c3 100644
--- a/bsp/hpmicro/hpm6p00evk/SConstruct
+++ b/bsp/hpmicro/hpm6p00evk/SConstruct
@@ -46,6 +46,7 @@ DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
     CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS,
     CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES')