drop LLVM_ prefix from option name

Author: nickdesaulniers

libc/CMakeLists.txt

@@ -46,10 +46,10 @@ set(LIBC_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 set(LIBC_ENABLE_USE_BY_CLANG OFF CACHE BOOL "Whether or not to place libc in a build directory findable by a just built clang")
 
-# LLVM_LIBC_USE_HOST_KERNEL_HEADERS is brittle, and frowned upon (prefer
+# LIBC_USE_HOST_KERNEL_HEADERS is brittle, and frowned upon (prefer
 # setting LIBC_KERNEL_HEADERS), but is simpler from a hello world linux host
 # build.
-set(LLVM_LIBC_USE_HOST_KERNEL_HEADERS OFF CACHE BOOL "Add /usr/include to the header seach path")
+set(LIBC_USE_HOST_KERNEL_HEADERS OFF CACHE BOOL "Add /usr/include to the header seach path")
 set(LIBC_KERNEL_HEADERS "" CACHE STRING "Path to Linux kernel headers")
 
 # Defining a global namespace to enclose all libc functions.

libc/cmake/modules/LLVMLibCArchitectures.cmake

@@ -217,22 +217,22 @@ if (LIBC_TARGET_OS_IS_WINDOWS AND LLVM_LIBC_FULL_BUILD)
 endif ()
 
 if (LIBC_TARGET_OS_IS_LINUX)
-  if (NOT LLVM_LIBC_USE_HOST_KERNEL_HEADERS AND NOT LIBC_KERNEL_HEADERS STREQUAL "")
-    message(FATAL_ERROR "MUST specify either LIBC_KERNEL_HEADERS or LLVM_LIBC_USE_HOST_KERNEL_HEADERS")
+  if (NOT LIBC_USE_HOST_KERNEL_HEADERS AND "${LIBC_KERNEL_HEADERS}" STREQUAL "")
+    message(FATAL_ERROR "MUST specify either LIBC_KERNEL_HEADERS or LIBC_USE_HOST_KERNEL_HEADERS")
   endif()
-  if (LLVM_LIBC_USE_HOST_KERNEL_HEADERS AND NOT LIBC_KERNEL_HEADERS STREQUAL "")
-    message(FATAL_ERROR "LLVM_LIBC_USE_HOST_KERNEL_HEADERS and LIBC_USE_HOST_KERNEL_HEADERS are mutually exclusive")
+  if (LIBC_USE_HOST_KERNEL_HEADERS AND NOT "${LIBC_KERNEL_HEADERS}" STREQUAL "")
+    message(FATAL_ERROR "LIBC_USE_HOST_KERNEL_HEADERS and LIBC_USE_HOST_KERNEL_HEADERS are mutually exclusive")
   endif()
-  if(LIBC_TARGET_TRIPLE AND LLVM_LIBC_USE_HOST_KERNEL_HEADERS)
+  if(LIBC_TARGET_TRIPLE AND LIBC_USE_HOST_KERNEL_HEADERS)
     # This is because the syscall numbers are frequently different between
     # different target architectures. Code may compile, but you'll get spooky
     # runtime failures.
-    message(FATAL_ERROR "LLVM_LIBC_USE_HOST_KERNEL_HEADERS should not be set when using LIBC_TARGET_TRIPLE, set LIBC_KERNEL_HEADERS instead")
+    message(FATAL_ERROR "LIBC_USE_HOST_KERNEL_HEADERS should not be set when using LIBC_TARGET_TRIPLE, set LIBC_KERNEL_HEADERS instead")
   endif()
-  if (NOT LIBC_KERNEL_HEADERS STREQUAL "" AND NOT IS_DIRECTORY LIBC_KERNEL_HEADERS)
+  if (NOT "${LIBC_KERNEL_HEADERS}" STREQUAL "" AND NOT IS_DIRECTORY "${LIBC_KERNEL_HEADERS}")
     message(FATAL_ERROR "LIBC_KERNEL_HEADERS should be a path to an existing directory")
   endif()
-  if (LLVM_LIBC_USE_HOST_KERNEL_HEADERS)
+  if (LIBC_USE_HOST_KERNEL_HEADERS)
     set(LIBC_KERNEL_HEADERS "/usr/include" CACHE STRING "Path to Linux kernel headers" FORCE)
   endif()
 endif()

libc/docs/getting_started.rst

@@ -20,8 +20,8 @@ Install dependencies first:
     -DCMAKE_BUILD_TYPE=Debug \
     -DCMAKE_CXX_COMPILER=clang++ \
     -DCMAKE_C_COMPILER=clang \
+    -DLIBC_USE_HOST_KERNEL_HEADERS=ON \
     -DLLVM_LIBC_FULL_BUILD=ON \
-    -DLLVM_LIBC_USE_HOST_KERNEL_HEADERS=ON \
     -DLLVM_LIBC_INCLUDE_SCUDO=ON \
     -DCOMPILER_RT_BUILD_SCUDO_STANDALONE_WITH_LLVM_LIBC=ON \
     -DCOMPILER_RT_BUILD_GWP_ASAN=OFF \