diff --git a/libcxx/benchmarks/CMakeLists.txt b/libcxx/benchmarks/CMakeLists.txt
index 673d4bbe3fd4..4160157da193 100644
--- a/libcxx/benchmarks/CMakeLists.txt
+++ b/libcxx/benchmarks/CMakeLists.txt
@@ -120,7 +120,11 @@ endmacro()
 file(GLOB BENCHMARK_TESTS "*.bench.cpp")
 foreach(test_path ${BENCHMARK_TESTS})
   get_filename_component(test_file "${test_path}" NAME)
-  message(STATUS "Adding Benchmark: ${test_file}")
   string(REPLACE ".bench.cpp" "" test_name "${test_file}")
+  if (NOT DEFINED ${test_name}_REPORTED)
+    message(STATUS "Adding Benchmark: ${test_file}")
+    # Only report the adding of the benchmark once.
+    set(${test_name}_REPORTED ON CACHE INTERNAL "")
+  endif()
   add_benchmark_test(${test_name} ${test_file})
 endforeach()
diff --git a/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake b/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
index 28ff85461de0..cf9fb1040f95 100644
--- a/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
+++ b/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
@@ -105,10 +105,7 @@ if (LIBCXX_USING_INSTALLED_LLVM OR LIBCXX_STANDALONE_BUILD)
 
   # Required doc configuration
   if (LLVM_ENABLE_SPHINX)
-    message(STATUS "Sphinx enabled.")
     find_package(Sphinx REQUIRED)
-  else()
-    message(STATUS "Sphinx disabled.")
   endif()
 
   # FIXME - This is cribbed from HandleLLVMOptions.cmake.