diff options
| author | Petr Hosek <phosek@google.com> | 2023-07-01 03:34:52 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@google.com> | 2023-07-10 07:32:24 +0000 |
| commit | 36c15be20b6fa3fbb2b25d4c24ac3416c465df8e (patch) | |
| tree | e4409294883ec81a0856381695d3cc47afaa93be /libc | |
| parent | 29f630a1ddcbb03caa31b5002f0cbc105ff3a869 (diff) | |
| download | llvm-36c15be20b6fa3fbb2b25d4c24ac3416c465df8e.zip llvm-36c15be20b6fa3fbb2b25d4c24ac3416c465df8e.tar.gz llvm-36c15be20b6fa3fbb2b25d4c24ac3416c465df8e.tar.bz2 | |
[libc] Use LIBC_INCLUDE_DIR in CMake rules
D152592 introduced LIBC_INCLUDE_DIR for the location of the include
directory, use it in relevant CMake rules.
Differential Revision: https://reviews.llvm.org/D154278
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/cmake/modules/LLVMLibCObjectRules.cmake | 4 | ||||
| -rw-r--r-- | libc/cmake/modules/LLVMLibCTestRules.cmake | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/libc/cmake/modules/LLVMLibCObjectRules.cmake b/libc/cmake/modules/LLVMLibCObjectRules.cmake index 27c73af..07de67e 100644 --- a/libc/cmake/modules/LLVMLibCObjectRules.cmake +++ b/libc/cmake/modules/LLVMLibCObjectRules.cmake @@ -134,7 +134,7 @@ function(_build_gpu_objects fq_target_name internal_target_name) ${ARGN} ) - set(include_dirs ${LIBC_BUILD_DIR}/include ${LIBC_SOURCE_DIR} ${LIBC_BUILD_DIR}) + set(include_dirs ${LIBC_SOURCE_DIR} ${LIBC_INCLUDE_DIR}) set(common_compile_options ${ADD_GPU_OBJ_COMPILE_OPTIONS}) if(NOT ADD_GPU_OBJ_CXX_STANDARD) set(ADD_GPU_OBJ_CXX_STANDARD ${CMAKE_CXX_STANDARD}) @@ -585,7 +585,7 @@ function(create_entrypoint_object fq_target_name) ${ADD_ENTRYPOINT_OBJ_COMPILE_OPTIONS} ) set(internal_target_name ${fq_target_name}.__internal__) - set(include_dirs ${LIBC_BUILD_DIR}/include ${LIBC_SOURCE_DIR} ${LIBC_BUILD_DIR}) + set(include_dirs ${LIBC_SOURCE_DIR} ${LIBC_INCLUDE_DIR}) get_fq_deps_list(fq_deps_list ${ADD_ENTRYPOINT_OBJ_DEPENDS}) set(full_deps_list ${fq_deps_list} libc.src.__support.common) diff --git a/libc/cmake/modules/LLVMLibCTestRules.cmake b/libc/cmake/modules/LLVMLibCTestRules.cmake index b2666d4..3f18047 100644 --- a/libc/cmake/modules/LLVMLibCTestRules.cmake +++ b/libc/cmake/modules/LLVMLibCTestRules.cmake @@ -148,8 +148,7 @@ function(create_libc_unittest fq_target_name) ${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR} - ${LIBC_BUILD_DIR} - ${LIBC_BUILD_DIR}/include + ${LIBC_INCLUDE_DIR} ) target_compile_options( ${fq_build_target_name} @@ -381,8 +380,7 @@ function(add_libc_fuzzer target_name) ${fq_target_name} PRIVATE ${LIBC_SOURCE_DIR} - ${LIBC_BUILD_DIR} - ${LIBC_BUILD_DIR}/include + ${LIBC_INCLUDE_DIR} ) target_link_libraries(${fq_target_name} PRIVATE @@ -512,8 +510,7 @@ function(add_integration_test test_name) ${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR} - ${LIBC_BUILD_DIR} - ${LIBC_BUILD_DIR}/include + ${LIBC_INCLUDE_DIR} ) target_compile_options(${fq_build_target_name} PRIVATE -fpie -ffreestanding -fno-exceptions -fno-rtti ${INTEGRATION_TEST_COMPILE_OPTIONS}) @@ -677,8 +674,7 @@ function(add_libc_hermetic_test test_name) ${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR} - ${LIBC_BUILD_DIR} - ${LIBC_BUILD_DIR}/include + ${LIBC_INCLUDE_DIR} ) target_compile_options(${fq_build_target_name} PRIVATE ${LIBC_HERMETIC_TEST_COMPILE_OPTIONS} ${HERMETIC_TEST_COMPILE_OPTIONS}) |