From d285c9e7ff9dbce5f94a6910afd3b04cf55752ea Mon Sep 17 00:00:00 2001
From: Yakov Olkhovskiy <yakov@clickhouse.com>
Date: Fri, 21 Oct 2022 14:04:01 +0000
Subject: [PATCH] move libfuzzer to dedicated contrib/libfuzzer-cmake

---
 contrib/CMakeLists.txt                    |  1 +
 contrib/libfuzzer-cmake/CMakeLists.txt    | 35 ++++++++++++++++++++++
 contrib/llvm-project-cmake/CMakeLists.txt | 36 -----------------------
 3 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 contrib/libfuzzer-cmake/CMakeLists.txt

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index f914c0d2d3f..c2b16ae6dd6 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -114,6 +114,7 @@ if (ENABLE_TESTS)
 endif()
 
 add_contrib (llvm-project-cmake llvm-project)
+add_contrib (libfuzzer-cmake llvm-project)
 add_contrib (libxml2-cmake libxml2)
 add_contrib (aws-s3-cmake
     aws
diff --git a/contrib/libfuzzer-cmake/CMakeLists.txt b/contrib/libfuzzer-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..ff3a91d828e
--- /dev/null
+++ b/contrib/libfuzzer-cmake/CMakeLists.txt
@@ -0,0 +1,35 @@
+set(COMPILER_RT_FUZZER_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/compiler-rt/lib/fuzzer")
+
+set(FUZZER_SRCS
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerCrossOver.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerDataFlowTrace.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerDriver.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtFunctionsDlsym.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtFunctionsWeak.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtFunctionsWindows.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtraCounters.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtraCountersDarwin.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtraCountersWindows.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerFork.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerIO.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerIOPosix.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerIOWindows.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerLoop.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerMerge.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerMutate.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerSHA1.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerTracePC.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtil.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilDarwin.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilFuchsia.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilLinux.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilPosix.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilWindows.cpp"
+)
+
+add_library(_fuzzer_no_main STATIC ${FUZZER_SRCS})
+add_library(ch_contrib::fuzzer_no_main ALIAS _fuzzer_no_main)
+
+add_library(_fuzzer STATIC ${FUZZER_SRCS} "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerMain.cpp")
+add_library(ch_contrib::fuzzer ALIAS _fuzzer)
+
diff --git a/contrib/llvm-project-cmake/CMakeLists.txt b/contrib/llvm-project-cmake/CMakeLists.txt
index 57995319cdd..6a73ae0f0c6 100644
--- a/contrib/llvm-project-cmake/CMakeLists.txt
+++ b/contrib/llvm-project-cmake/CMakeLists.txt
@@ -1,39 +1,3 @@
-set(COMPILER_RT_FUZZER_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/compiler-rt/lib/fuzzer")
-
-set(FUZZER_SRCS
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerCrossOver.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerDataFlowTrace.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerDriver.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtFunctionsDlsym.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtFunctionsWeak.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtFunctionsWindows.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtraCounters.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtraCountersDarwin.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtraCountersWindows.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerFork.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerIO.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerIOPosix.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerIOWindows.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerLoop.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerMerge.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerMutate.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerSHA1.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerTracePC.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtil.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilDarwin.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilFuchsia.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilLinux.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilPosix.cpp"
-    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilWindows.cpp"
-)
-
-add_library(_fuzzer_no_main STATIC ${FUZZER_SRCS})
-add_library(ch_contrib::fuzzer_no_main ALIAS _fuzzer_no_main)
-
-add_library(_fuzzer STATIC ${FUZZER_SRCS} "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerMain.cpp")
-add_library(ch_contrib::fuzzer ALIAS _fuzzer)
-
-
 if (APPLE OR NOT ARCH_AMD64 OR SANITIZE STREQUAL "undefined")
    set (ENABLE_EMBEDDED_COMPILER_DEFAULT OFF)
 else()