diff --git a/libcxx/utils/CMakeLists.txt b/libcxx/utils/CMakeLists.txt
--- a/libcxx/utils/CMakeLists.txt
+++ b/libcxx/utils/CMakeLists.txt
@@ -15,9 +15,16 @@
     COMMAND "${Python3_EXECUTABLE}" "${LIBCXX_SOURCE_DIR}/utils/generate_private_header_tests.py"
     COMMENT "Generate tests for ensuring that detail headers are private.")
 
+add_custom_target(libcxx-lint
+    COMMAND "${Python3_EXECUTABLE}" "${LIBCXX_SOURCE_DIR}/test/libcxx/lint/lint_cmakelists.sh.py"
+    COMMAND "${Python3_EXECUTABLE}" "${LIBCXX_SOURCE_DIR}/test/libcxx/lint/lint_headers.sh.py"
+    COMMAND "${Python3_EXECUTABLE}" "${LIBCXX_SOURCE_DIR}/test/libcxx/lint/lint_modulemap.sh.py"
+    COMMENT "Lint the header files, CMakeLists.txt, and modulemap.")
+
 add_custom_target(libcxx-generate-files
     DEPENDS libcxx-generate-public-header-transitive-inclusion-tests
             libcxx-generate-public-header-tests
             libcxx-generate-feature-test-macros
             libcxx-generate-private-header-tests
+            libcxx-lint
     COMMENT "Create all the auto-generated files in libc++ and its tests.")