[llvm] [libc] remove references to LIBC_HDRGEN_ONLY (PR #118670)

Nick Desaulniers via llvm-commits llvm-commits at lists.llvm.org
Wed Dec 4 14:03:34 PST 2024


https://github.com/nickdesaulniers updated https://github.com/llvm/llvm-project/pull/118670

>From 20a00663f4ded0d26b6ef945f854b2459341c0d6 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers at google.com>
Date: Wed, 4 Dec 2024 09:20:01 -0800
Subject: [PATCH 1/2] [libc] remove references to LIBC_HDRGEN_ONLY

Further cleanups from old hdrgen removal. I didn't realize there were cmake
variables related to old hdrgen spread out throughout more of the source tree.

Link: #117220
Link: #117208
---
 llvm/cmake/modules/CrossCompile.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake
index c22d185349dcc5..b0d36d8dbf4eb0 100644
--- a/llvm/cmake/modules/CrossCompile.cmake
+++ b/llvm/cmake/modules/CrossCompile.cmake
@@ -69,8 +69,8 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype)
          "-DLLVM_EXTERNAL_${name}_SOURCE_DIR=${LLVM_EXTERNAL_${name}_SOURCE_DIR}")
   endforeach()
 
-  if("libc" IN_LIST LLVM_ENABLE_PROJECTS AND NOT LIBC_HDRGEN_EXE)
-    set(libc_flags -DLLVM_LIBC_FULL_BUILD=ON -DLIBC_HDRGEN_ONLY=ON)
+  if("libc" IN_LIST LLVM_ENABLE_PROJECTS)
+    set(libc_flags -DLLVM_LIBC_FULL_BUILD=ON)
     if(MSVC)
       # Due to some issues mentioned in llvm/projects/CMakeLists.txt, libc build is disabled by
       # default in the cross target when building with MSVC compatible compilers on Windows. Add

>From 7da006b1f7fff0ea20d017b405c418e5dc9c8ab5 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers at google.com>
Date: Wed, 4 Dec 2024 09:46:17 -0800
Subject: [PATCH 2/2] remove block from b348126

---
 llvm/cmake/modules/CrossCompile.cmake | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake
index b0d36d8dbf4eb0..c2cc84bec15217 100644
--- a/llvm/cmake/modules/CrossCompile.cmake
+++ b/llvm/cmake/modules/CrossCompile.cmake
@@ -69,17 +69,8 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype)
          "-DLLVM_EXTERNAL_${name}_SOURCE_DIR=${LLVM_EXTERNAL_${name}_SOURCE_DIR}")
   endforeach()
 
-  if("libc" IN_LIST LLVM_ENABLE_PROJECTS)
-    set(libc_flags -DLLVM_LIBC_FULL_BUILD=ON)
-    if(MSVC)
-      # Due to some issues mentioned in llvm/projects/CMakeLists.txt, libc build is disabled by
-      # default in the cross target when building with MSVC compatible compilers on Windows. Add
-      # LLVM_FORCE_BUILD_RUNTIME to bypass this issue and force its building on Windows.
-      list(APPEND libc_flags -DLLVM_FORCE_BUILD_RUNTIME=ON)
-    endif()
-  endif()
   if(LLVM_LIBC_GPU_BUILD)
-    list(APPEND libc_flags -DLLVM_LIBC_GPU_BUILD=ON)
+    set(libc_flags -DLLVM_LIBC_GPU_BUILD=ON)
   endif()
 
   add_custom_command(OUTPUT ${${project_name}_${target_name}_BUILD}/CMakeCache.txt



More information about the llvm-commits mailing list