[libc] Specify path for making include/ subdirs #66589
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-libc ChangesWhen 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.Full diff: https://github.com/llvm/llvm-project/pull/66589.diff 1 Files Affected:
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
|
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. Tested: Build within vscode Commandline build with: cmake ../llvm -DLLVM_ENABLE_PROJECTS="libc" -DCMAKE_BUILD_TYPE=Debug \ -DLLVM_LIBC_FULL_BUILD=true -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ cmke --build . --target libc (Note that this is Makefile build, not ninja)
sivachandra
reviewed
Sep 18, 2023
| @@ -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) | |||
There was a problem hiding this comment.
Is CMAKE_CURRENT_BINARY_DIR more appropriate?
There was a problem hiding this comment.
I don't think so. In the libc/CMakeLists.txt there's LIBC_INCLUDE_DIR is redefined a few times, one of which is:
elseif(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND LIBC_ENABLE_USE_BY_CLANG)
set(LIBC_INCLUDE_DIR ${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE})
Whereas LIBC_INCLUDE_DIR is implemented in terms of it:
set(LIBC_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include)
Nothing else in this file refers to the CMAKE_CURRENT_BINARY_DIR, but there is other references to LIBC_INCLUDE_DIR:
target_include_directories(libc-headers SYSTEM INTERFACE ${LIBC_INCLUDE_DIR})
I'm not a CMake expert, though. I'm happy to adjust if that's better!
There was a problem hiding this comment.
You are correct. ${LIBC_INCLUDE_PATH} is the correct path.
sivachandra
approved these changes
Sep 19, 2023
ZijunZhaoCCK
pushed a commit
to ZijunZhaoCCK/llvm-project
that referenced
this pull request
Sep 19, 2023
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.
This was referenced Sep 19, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.