diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7202v300_openipc_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7202v300_openipc_defconfig
index c91cdb5b..41567fcc 100644
--- a/br-ext-chip-goke/configs/unknown_unknown_gk7202v300_openipc_defconfig
+++ b/br-ext-chip-goke/configs/unknown_unknown_gk7202v300_openipc_defconfig
@@ -17,7 +17,7 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_USES_MUSL=y
 BR2_TOOLCHAIN_BUILDROOT_MUSL=y
 BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
-# BR2_TOOLCHAIN_BUILDROOT_CXX is not set
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 
diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig
index b97565dc..71f8e538 100644
--- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig
+++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig
@@ -17,7 +17,7 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_USES_MUSL=y
 BR2_TOOLCHAIN_BUILDROOT_MUSL=y
 BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
-# BR2_TOOLCHAIN_BUILDROOT_CXX is not set
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 
diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_openipc_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_openipc_defconfig
index f19b2c66..7b69f622 100644
--- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_openipc_defconfig
+++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_openipc_defconfig
@@ -17,7 +17,7 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_USES_MUSL=y
 BR2_TOOLCHAIN_BUILDROOT_MUSL=y
 BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
-# BR2_TOOLCHAIN_BUILDROOT_CXX is not set
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 
diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_openipc_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_openipc_defconfig
index fdf59451..5e4aed3e 100644
--- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_openipc_defconfig
+++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_openipc_defconfig
@@ -17,7 +17,7 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_USES_MUSL=y
 BR2_TOOLCHAIN_BUILDROOT_MUSL=y
 BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
-# BR2_TOOLCHAIN_BUILDROOT_CXX is not set
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 
diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7605v100_openipc_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7605v100_openipc_defconfig
index 007448cc..a57c328d 100644
--- a/br-ext-chip-goke/configs/unknown_unknown_gk7605v100_openipc_defconfig
+++ b/br-ext-chip-goke/configs/unknown_unknown_gk7605v100_openipc_defconfig
@@ -17,7 +17,7 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_USES_MUSL=y
 BR2_TOOLCHAIN_BUILDROOT_MUSL=y
 BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
-# BR2_TOOLCHAIN_BUILDROOT_CXX is not set
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y