diff --git a/CMakeLists.txt b/CMakeLists.txt
index a760098..be22fb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@
                   --print-resource-dir not supported by host compiler")
 endif()
 
-option(LLVM_LIBC_ENABLE_LINTING "Enables linting of libc source files" ON)
+option(LLVM_LIBC_ENABLE_LINTING "Enables linting of libc source files" OFF)
 if(LLVM_LIBC_ENABLE_LINTING)
   if("clang-tools-extra" IN_LIST LLVM_ENABLE_PROJECTS
              AND "clang" IN_LIST LLVM_ENABLE_PROJECTS)
@@ -81,6 +81,10 @@
   list(APPEND TARGET_ENTRYPOINT_NAME_LIST ${entrypoint_name})
 endforeach()
 
+# We need to set up hdrgen first since other targets depend on it.
+add_subdirectory(utils/LibcTableGenUtil)
+add_subdirectory(utils/HdrGen)
+
 add_subdirectory(include)
 add_subdirectory(config)
 add_subdirectory(src)
diff --git a/cmake/modules/LLVMLibCHeaderRules.cmake b/cmake/modules/LLVMLibCHeaderRules.cmake
index c01cf25..ab1f6fe 100644
--- a/cmake/modules/LLVMLibCHeaderRules.cmake
+++ b/cmake/modules/LLVMLibCHeaderRules.cmake
@@ -89,14 +89,15 @@
 
   add_custom_command(
     OUTPUT ${out_file}
-    COMMAND $<TARGET_FILE:libc-hdrgen> -o ${out_file} --header ${ADD_GEN_HDR_GEN_HDR}
+    COMMAND ${LIBC_TABLEGEN_EXE} -o ${out_file} --header ${ADD_GEN_HDR_GEN_HDR}
             --def ${in_file} ${replacement_params} -I ${LIBC_SOURCE_DIR}
            ${ENTRYPOINT_NAME_LIST_ARG}
            ${LIBC_SOURCE_DIR}/config/${LIBC_TARGET_OS}/api.td
 
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS ${in_file} ${fq_data_files} ${td_includes}
-            ${LIBC_SOURCE_DIR}/config/${LIBC_TARGET_OS}/api.td libc-hdrgen
+            ${LIBC_SOURCE_DIR}/config/${LIBC_TARGET_OS}/api.td
+            ${LIBC_TABLEGEN_EXE} ${LIBC_TABLEGEN_TARGET}
   )
 
   get_fq_target_name(${target_name} fq_target_name)
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index a551820..dfee264 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,7 +1,5 @@
 add_subdirectory(CPP)
 add_subdirectory(FPUtil)
-add_subdirectory(LibcTableGenUtil)
-add_subdirectory(HdrGen)
 add_subdirectory(MPFRWrapper)
 add_subdirectory(testutils)
 add_subdirectory(tools)
diff --git a/utils/HdrGen/CMakeLists.txt b/utils/HdrGen/CMakeLists.txt
index 8aaaa96..75192a0 100644
--- a/utils/HdrGen/CMakeLists.txt
+++ b/utils/HdrGen/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_LINK_COMPONENTS Support)
 
-add_tablegen(libc-hdrgen llvm-libc
+add_tablegen(libc-hdrgen LIBC
   Command.h
   Command.cpp
   Generator.cpp