[libc-commits] [libc] ba93b23 - [libc] Revert "Eliminate the internal header library target."

[Siva Chandra Reddy via libc-commits]

Author: Siva Chandra Reddy
Date: 2022-06-23T20:53:09Z
New Revision: ba93b23eb3289575164de685c8a42c7b41540a58

URL: https://github.com/llvm/llvm-project/commit/ba93b23eb3289575164de685c8a42c7b41540a58
DIFF: https://github.com/llvm/llvm-project/commit/ba93b23eb3289575164de685c8a42c7b41540a58.diff

LOG: [libc] Revert "Eliminate the internal header library target."

This reverts commit 306f2731f482d32ccf557996ff122f7293cb30cb. The CMake
version used by the bots does like it.

Added: 
    

Modified: 
    libc/cmake/modules/LLVMLibCLibraryRules.cmake

Removed: 
    


################################################################################
diff  --git a/libc/cmake/modules/LLVMLibCLibraryRules.cmake b/libc/cmake/modules/LLVMLibCLibraryRules.cmake
index 50ee8549a8d83..a50bb8a47a17f 100644
--- a/libc/cmake/modules/LLVMLibCLibraryRules.cmake
+++ b/libc/cmake/modules/LLVMLibCLibraryRules.cmake
@@ -153,16 +153,24 @@ function(create_header_library fq_target_name)
       endforeach()
     endif()
   endif()
+  set(interface_target_name "${fq_target_name}.__header_library__")
 
-  add_library(${fq_target_name} INTERFACE)
-  target_sources(${fq_target_name} INTERFACE ${FULL_HDR_PATHS})
+  add_library(${interface_target_name} INTERFACE)
+  target_sources(${interface_target_name} INTERFACE ${FULL_HDR_PATHS})
   if(ADD_HEADER_DEPENDS)
-    add_dependencies(${fq_target_name} ${ADD_HEADER_DEPENDS})
+    add_dependencies(${interface_target_name} ${ADD_HEADER_DEPENDS})
   endif()
   set_target_properties(
-    ${fq_target_name}
+    ${interface_target_name}
     PROPERTIES
       INTERFACE_FLAGS "${ADD_HEADER_FLAGS}"
+  )
+
+  add_custom_target(${fq_target_name})
+  add_dependencies(${fq_target_name} ${interface_target_name})
+  set_target_properties(
+    ${fq_target_name}
+    PROPERTIES
       TARGET_TYPE "${HDR_LIBRARY_TARGET_TYPE}"
       DEPS "${ADD_HEADER_DEPENDS}"
       FLAGS "${ADD_HEADER_FLAGS}"