diff --git a/config.nims b/config.nims
index 60eb7b2c9a..e37b12c9ec 100644
--- a/config.nims
+++ b/config.nims
@@ -131,6 +131,10 @@ switch("passL", "-fno-omit-frame-pointer")
 # for heap-usage-by-instance-type metrics and object base-type strings
 --define:nimTypeNames
 
+# Workaround for v2.2.8 regression; remove with v2.2.10
+# https://github.com/nim-lang/Nim/pull/25343
+--mangle:cpp
+
 switch("define", "nim_compiler_path=" & currentDir & "env.sh nim")
 switch("define", "withoutPCRE")
 
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index d7814d6a90..77b2c37f6b 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit d7814d6a9013241dea22aed816c6fffbba6e72be
+Subproject commit 77b2c37f6bb50aac4796a1153b9fdee25d71a26e