Index: lib/Fuzzer/CMakeLists.txt
===================================================================
--- lib/Fuzzer/CMakeLists.txt
+++ lib/Fuzzer/CMakeLists.txt
@@ -8,6 +8,9 @@
       "LLVM_USE_SANITIZE_COVERAGE=YES to be set."
       )
   endif()
+
+  add_subdirectory(Support)
+
   add_library(LLVMFuzzerNoMainObjects OBJECT
     FuzzerCrossOver.cpp
     FuzzerDriver.cpp
@@ -26,11 +29,13 @@
     $<TARGET_OBJECTS:LLVMFuzzerNoMainObjects>
     )
   target_link_libraries(LLVMFuzzerNoMain ${PTHREAD_LIB})
+  target_link_libraries(LLVMFuzzerNoMain LLVMFuzzerSupport)
   add_library(LLVMFuzzer STATIC
     FuzzerMain.cpp
     $<TARGET_OBJECTS:LLVMFuzzerNoMainObjects>
     )
   target_link_libraries(LLVMFuzzer ${PTHREAD_LIB})
+  target_link_libraries(LLVMFuzzer LLVMFuzzerSupport)
 
   if( LLVM_INCLUDE_TESTS )
     add_subdirectory(test)
Index: lib/Fuzzer/Support/CMakeLists.txt
===================================================================
--- /dev/null
+++ lib/Fuzzer/Support/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_library(LLVMFuzzerSupport STATIC
+  Util.cpp
+  UtilDarwin.cpp
+  UtilLinux.cpp
+  UtilPosix.cpp
+  UtilWindows.cpp
+  UtilIO.cpp
+  UtilIOPosix.cpp
+  UtilIOWindows.cpp
+  )