diff --git a/libcxx.spec b/libcxx.spec
index ce940cb..1e28dd4 100644
--- a/libcxx.spec
+++ b/libcxx.spec
@@ -1,7 +1,9 @@
 # If you need to bootstrap this, turn this on.
 # Otherwise, you have a loop with libcxxabi
+%ifnarch riscv64
 %global toolchain clang
-%global bootstrap 0
+%endif
+%global bootstrap 1
 
 %global libcxx_version 15.0.0
 #global rc_ver 3
@@ -160,6 +162,9 @@ install -m 0644 src/include/*.h %{buildroot}%{_includedir}/libcxx-internal/
 
 
 %changelog
+* Fri Oct 07 2022 David Abdurachmanov <davidlt@rivosinc.com> - 15.0.0-2.0.riscv64
+- Bootstrap on riscv64
+
 * Tue Sep 13 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-2
 - Link libc++.a against libc++abi.a