[libc-commits] [libc] [libc] Specify path for making include/ subdirs (PR #66589)

[Jeff Bailey via libc-commits]

https://github.com/kaladron updated https://github.com/llvm/llvm-project/pull/66589

>From 24d8e8ad8155714671e48b2a9fdf62bb51135500 Mon Sep 17 00:00:00 2001
From: Jeff Bailey <jbailey at raspberryginger.com>
Date: Sun, 17 Sep 2023 00:16:13 +0000
Subject: [PATCH 1/2] [libc] Specify path for making include/ subdirs

When doing a clean build from vscode, it makes the subdirectories in the
source tree rather than in the build folder.  Elsehwere in LLVM, they
prefix the MAKE_DIRECTORY calls, so this appears to be the correct
approach.
---
 libc/include/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
index 2e57275e10bc4cf..06a342d28221561 100644
--- a/libc/include/CMakeLists.txt
+++ b/libc/include/CMakeLists.txt
@@ -78,7 +78,7 @@ add_gen_header(
 )
 
 # TODO: This should be conditional on POSIX networking being included.
-file(MAKE_DIRECTORY "arpa")
+file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/"arpa")
 
 add_gen_header(
   arpa_inet
@@ -280,7 +280,7 @@ add_gen_header(
 # TODO: Not all platforms will have a include/sys directory. Add the sys
 # directory and the targets for sys/*.h files conditional to the OS requiring
 # them.
-file(MAKE_DIRECTORY "sys")
+file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/sys)
 
 add_gen_header(
   sys_auxv
@@ -497,7 +497,7 @@ add_gen_header(
 )
 
 if(LIBC_TARGET_ARCHITECTURE_IS_GPU)
-  file(MAKE_DIRECTORY "gpu")
+  file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/"gpu")
 
   add_gen_header(
     gpu_rpc

>From 60722ee0caaadc28c1980eb2a7ef7e5d3c7005ea Mon Sep 17 00:00:00 2001
From: Jeff Bailey <jbailey at raspberryginger.com>
Date: Sun, 17 Sep 2023 16:03:50 +0000
Subject: [PATCH 2/2] Remove extra quote marks from directory names

---
 libc/include/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
index 06a342d28221561..fd2cb9351419ca8 100644
--- a/libc/include/CMakeLists.txt
+++ b/libc/include/CMakeLists.txt
@@ -78,7 +78,7 @@ add_gen_header(
 )
 
 # TODO: This should be conditional on POSIX networking being included.
-file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/"arpa")
+file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/arpa)
 
 add_gen_header(
   arpa_inet
@@ -497,7 +497,7 @@ add_gen_header(
 )
 
 if(LIBC_TARGET_ARCHITECTURE_IS_GPU)
-  file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/"gpu")
+  file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/gpu)
 
   add_gen_header(
     gpu_rpc