Index: llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/lib/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373.orig/compiler-rt/lib/CMakeLists.txt
+++ llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/lib/CMakeLists.txt
@@ -56,6 +56,6 @@ if(COMPILER_RT_BUILD_XRAY)
   compiler_rt_build_runtime(xray)
 endif()
 
-if(COMPILER_RT_BUILD_LIBFUZZER)
-  compiler_rt_build_runtime(fuzzer)
-endif()
+#if(COMPILER_RT_BUILD_LIBFUZZER)
+#  compiler_rt_build_runtime(fuzzer)
+#endif()
Index: llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/test/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373.orig/compiler-rt/test/CMakeLists.txt
+++ llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/test/CMakeLists.txt
@@ -54,9 +54,9 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
     compiler_rt_test_runtime(sanitizer_common)
 
     # OpenBSD not supporting asan, cannot run the tests
-    if(COMPILER_RT_BUILD_LIBFUZZER AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" AND NOT ANDROID)
-      compiler_rt_test_runtime(fuzzer)
-    endif()
+#    if(COMPILER_RT_BUILD_LIBFUZZER AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" AND NOT ANDROID)
+#      compiler_rt_test_runtime(fuzzer)
+#    endif()
 
     foreach(sanitizer ${COMPILER_RT_SANITIZERS_TO_BUILD})
       # cfi testing is gated on ubsan