diff -Nru generate-ninja-0.0~git20220811.0bcd37b/debian/changelog generate-ninja-0.0~git20220811.0bcd37b/debian/changelog
--- generate-ninja-0.0~git20220811.0bcd37b/debian/changelog	2022-08-15 07:56:34.000000000 +0000
+++ generate-ninja-0.0~git20220811.0bcd37b/debian/changelog	2022-08-28 23:01:35.000000000 +0000
@@ -1,3 +1,10 @@
+generate-ninja (0.0~git20220811.0bcd37b-1+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 0.0~git20220118.0725d78-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 19 Mar 2022 18:29:19 +0000]
+  * Build with clang 11 to avoid armv7 contamination.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sun, 28 Aug 2022 23:01:35 +0000
+
 generate-ninja (0.0~git20220811.0bcd37b-1) unstable; urgency=medium
 
   * Update Unbundling-version.git patch.
diff -Nru generate-ninja-0.0~git20220811.0bcd37b/debian/control generate-ninja-0.0~git20220811.0bcd37b/debian/control
--- generate-ninja-0.0~git20220811.0bcd37b/debian/control	2022-08-15 07:56:34.000000000 +0000
+++ generate-ninja-0.0~git20220811.0bcd37b/debian/control	2022-08-28 23:01:35.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: qinxialei <xialeiqin@gmail.com>
 Uploaders: Ricardo Ribalda Delgado <ricardo@ribalda.com>
-Build-Depends: clang [linux-any],
+Build-Depends: clang-11,
                debhelper-compat (= 13),
                git,
                help2man,
diff -Nru generate-ninja-0.0~git20220811.0bcd37b/debian/rules generate-ninja-0.0~git20220811.0bcd37b/debian/rules
--- generate-ninja-0.0~git20220811.0bcd37b/debian/rules	2022-08-15 07:56:34.000000000 +0000
+++ generate-ninja-0.0~git20220811.0bcd37b/debian/rules	2022-08-28 23:01:35.000000000 +0000
@@ -18,6 +18,8 @@
 export CXX = c++
 endif
 
+export CXX = clang++-11
+
 %:
 	dh $@ --buildsystem=ninja --builddirectory=out