diff --git a/debian/changelog b/debian/changelog
index c1c959b3..815a6919 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,27 @@
 llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium
 
   * Generate libunwind-12 & libunwind-12-dev packages
+  * Add the following option to the libc++ build:
+    -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON
 
   [ Kasper Kantz ]
   * Add riscv64 architecture in control
     enable liblldb, libomp and others which are
     currently unavailable in riscv64 repository.
-
+  [ Kasper Kantz ]
   [ Krzysztof Aleksander Pyrkosz ]
   * Add libxml2 as a dependency as it is necessary
     for llvm manifest tool (llvm-mt)
     (Closes: #990537)
+  [ Krzysztof Aleksander Pyrkosz ]
+  [ Jordan Justen ]
+  * d/rules: Adjust cmake defines to fix libclc.pc paths
+    (Closes: #990537)
 
   [ Jordan Justen ]
   * d/rules: Adjust cmake defines to fix libclc.pc paths
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 12 Jul 2021 08:19:59 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 27 Jul 2021 00:01:29 +0200
 
 llvm-toolchain-12 (1:12.0.1-1) unstable; urgency=medium
 
diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index f5e4ebbe..d0f584ec 100755
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -939,6 +939,20 @@ clang++-$VERSION -std=c++11 -stdlib=libc++ foo.cpp -o o
 clang++-$VERSION -std=c++14 -stdlib=libc++ foo.cpp -lc++experimental -o o
 ./o > /dev/null
 
+# Bug 46321
+cat > test.cpp << EOF
+#include <iostream>
+int main() {
+  std::cout << "Hello World!" << std::endl;
+}
+EOF
+clang++-$VERSION -stdlib=libc++ -unwindlib=libunwind -rtlib=compiler-rt -static-libstdc++ -static-libgcc test.cpp &> /dev/null || true
+
+clang++-$VERSION -stdlib=libc++ -static-libstdc++ -fuse-ld=lld -l:libc++abi.a test.cpp -o test
+./test
+
+clang++-$VERSION -stdlib=libc++ -nostdlib++ test.cpp -l:libc++.a -l:libc++abi.a -pthread -o test
+
 # Bug 889832
 echo '#include <iostream>
 int main() {}'  | clang++-$VERSION -std=c++1z  -x c++ -stdlib=libc++ -
diff --git a/debian/rules b/debian/rules
index fd872931..aa13a4ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -473,6 +473,9 @@ LIBCXX_CMAKE_OPTIONS := \
 	-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
 	-DLIBCXX_USE_COMPILER_RT=YES \
 	-DLIBCXXABI_USE_COMPILER_RT=YES \
+	-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \
+	-DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \
+	-DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \
 	$(CMAKE_EXTRA) \
 	$(CMAKE_EXTRA_LIBCXX)