diff --git a/compiler-rt/lib/CMakeLists.txt b/compiler-rt/lib/CMakeLists.txt
index e6158ec408895..42a57eaa70384 100644
--- a/compiler-rt/lib/CMakeLists.txt
+++ b/compiler-rt/lib/CMakeLists.txt
@@ -9,7 +9,10 @@ include(SanitizerUtils)
 #
 #TODO: Refactor sanitizer_common into smaller pieces (e.g. flag parsing, utils).
 if (COMPILER_RT_HAS_SANITIZER_COMMON AND
-    (COMPILER_RT_BUILD_SANITIZERS OR COMPILER_RT_BUILD_XRAY OR COMPILER_RT_BUILD_MEMPROF OR COMPILER_RT_BUILD_CTX_PROFILE))
+    (COMPILER_RT_BUILD_SANITIZERS OR
+      (COMPILER_RT_HAS_XRAY AND COMPILER_RT_BUILD_XRAY) OR
+      (COMPILER_RT_HAS_MEMPROF AND COMPILER_RT_BUILD_MEMPROF) OR
+      (COMPILER_RT_HAS_CTX_PROFILE AND COMPILER_RT_BUILD_CTX_PROFILE)))
   add_subdirectory(sanitizer_common)
 endif()