diff --git a/debian/changelog b/debian/changelog
index aa223f4a..18ebdd15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -128,9 +128,12 @@ llvm-toolchain-snapshot (1:13~++20210129063721+010b176cdefb-1~exp1) experimental
 
 llvm-toolchain-12 (1:12.0.1-7) UNRELEASED; urgency=medium
 
+  *  cmake: use ON instead of YES for consistency
+
+  [  Gianfranco Costamagna ]
   * Add a patch to fix omp build on riscv64
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 27 Aug 2021 10:43:26 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 29 Aug 2021 15:15:18 +0200
 
 llvm-toolchain-12 (1:12.0.1-6) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 7a80cde0..34b10aeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -213,7 +213,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel hurd-i386 powerpc spa
   LIBUNWIND_ENABLE=no
 else
   PROJECTS+=;libunwind
-  CMAKE_LIBCXX_EXTRA += -DLIBCXXABI_USE_LLVM_UNWINDER=YES
+  CMAKE_LIBCXX_EXTRA += -DLIBCXXABI_USE_LLVM_UNWINDER=ON
 endif
 
 RUN_TEST=yes
@@ -497,8 +497,8 @@ LIBCXX_CMAKE_OPTIONS := \
 	-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
 	-DLLVM_EXTERNAL_LIT=$(BASE_PATH)/llvm/utils/lit/lit.py \
 	-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
-	-DLIBCXX_USE_COMPILER_RT=YES \
-	-DLIBCXXABI_USE_COMPILER_RT=YES \
+	-DLIBCXX_USE_COMPILER_RT=ON \
+	-DLIBCXXABI_USE_COMPILER_RT=ON \
 	-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \
 	-DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \
 	-DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \