diff --git a/SPECS/llvm-compat.spec b/SPECS/llvm-compat.spec
index 7ec8d13..c44eca6 100644
--- a/SPECS/llvm-compat.spec
+++ b/SPECS/llvm-compat.spec
@@ -1,7 +1,7 @@
 %global maj_ver 12
 %global min_ver 0
 %global patch_ver 1
-%global baserelease 3
+%global baserelease 4
 
 # Limit build jobs on ppc64 systems to avoid running out of memory.
 %global _smp_mflags -j8
@@ -134,8 +134,15 @@ pushd clang-build
 
 export DESTDIR=%{buildroot}
 %__ninja help | grep 'libclang[a-zA-Z0-9]*.so' | cut -d ':' -f 1 | xargs %__ninja %__ninja_common_opts -l 8
+# I have not been able to build libclang-cpp.so on i686.
+%ifnarch %ix86
+%__ninja help | grep 'libclang-cpp[a-zA-Z0-9]*.so' | cut -d ':' -f 1 | xargs %__ninja %__ninja_common_opts -l 8
+%endif
 unset DESTDIR
 
+# Remove all static archives to avoid running out of disk space on aarch64.
+find . -iname '*.a' -delete
+
 popd
 
 %install
@@ -155,8 +162,14 @@ install clang-build/%{_lib}/*.so.%{maj_ver} %{buildroot}%{_libdir}
 %files libs
 %{_libdir}/libLLVM-%{maj_ver}.so
 %{_libdir}/libclang*.so.%{maj_ver}
+%ifnarch %ix86
+%{_libdir}/libclang-cpp*.so.%{maj_ver}
+%endif
 
 %changelog
+* Tue Nov 23 2021 Tom Stellard <tstellar@redhat.com> - 12.0.1-4
+- Add libclang-cpp.so to package
+
 * Mon Nov 01 2021 Tom Stellard <tstellar@redhat.com> - 12.0.1-3
 - Enable WebAssembly target