diff --git a/_config b/_config
index 399a6d6..159efa0 100644
--- a/_config
+++ b/_config
@@ -3931,6 +3931,7 @@ Prefer: -go1.18-openssl
 
 # Split between customer facing and internal compiler see gcc SR#322365
 Prefer: cpp-build
+Prefer: gcc-build-c++ gcc-build
 Substitute: gcc gcc-build
 Substitute: gcc-c++ gcc-build-c++
 Substitute: gcc-32bit gcc-build-32bit
@@ -3987,6 +3988,7 @@ BuildFlags: onlybuild:fipscheck
 BuildFlags: onlybuild:flex
 BuildFlags: onlybuild:gawk
 BuildFlags: onlybuild:gcc
+BuildFlags: onlybuild:gcc:build
 BuildFlags: onlybuild:gcc13
 BuildFlags: onlybuild:gdbm
 BuildFlags: onlybuild:gettext-runtime:gettext-runtime-mini