diff --git a/compiler-rt.spec b/compiler-rt.spec
index b4c08ff..52fc2fe 100644
--- a/compiler-rt.spec
+++ b/compiler-rt.spec
@@ -4,7 +4,7 @@
 %endif
 
 #%%global rc_ver 6
-%global baserelease 5
+%global baserelease 6
 
 %global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
 
@@ -36,6 +36,7 @@ Patch1:		0001-Fix-strict-aliasing-warning-in-msan.cpp.patch
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
+BuildRequires:	ninja-build
 BuildRequires:	python3
 # We need python3-devel for pathfix.py.
 BuildRequires:	python3-devel
@@ -57,9 +58,7 @@ instrumentation, and Blocks C language extension.
 pathfix.py -i %{__python3} -pn lib/hwasan/scripts/hwasan_symbolize
 
 %build
-mkdir -p _build
-cd _build
-%cmake .. \
+%cmake  -GNinja \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DLLVM_CONFIG_PATH:FILEPATH=%{_bindir}/llvm-config-%{__isa_bits} \
 	\
@@ -70,11 +69,11 @@ cd _build
 %endif
 	-DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF # could be on?
 
-make %{?_smp_mflags}
+%cmake_build
 
 %install
-cd _build
-make install DESTDIR=%{buildroot}
+
+%cmake_install
 
 # move blacklist/abilist files to where clang expect them
 mkdir -p %{buildroot}%{_libdir}/clang/%{version}/share
@@ -107,7 +106,8 @@ done
 popd
 
 %check
-#make check-all -C _build
+
+#%%cmake_build --target check-compiler-rt
 
 %files
 %{_includedir}/*
@@ -117,6 +117,9 @@ popd
 %endif
 
 %changelog
+* Mon Jul 20 2020 sguelton@redhat.com - 10.0.0-6
+- Use modern cmake macros
+
 * Wed Jul 15 2020 sguelton@redhat.com - 10.0.0-5
 - Fix multilib runtime links, see rhbz#1855379