[libc-commits] [PATCH] D154278: [libc] Use LIBC_INCLUDE_DIR in tests

[Petr Hosek via Phabricator via libc-commits]

phosek created this revision.
phosek added reviewers: michaelrj, sivachandra.
Herald added projects: libc-project, All.
Herald added a subscriber: libc-commits.
phosek requested review of this revision.

D152592 <https://reviews.llvm.org/D152592> introduced LIBC_INCLUDE_DIR for the location of the include
directory, use it in tests.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D154278

Files:
  libc/cmake/modules/LLVMLibCTestRules.cmake


Index: libc/cmake/modules/LLVMLibCTestRules.cmake
===================================================================
--- libc/cmake/modules/LLVMLibCTestRules.cmake
+++ libc/cmake/modules/LLVMLibCTestRules.cmake
@@ -148,8 +148,7 @@
     ${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 @@
     ${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 @@
     ${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 @@
     ${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})


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D154278.536504.patch
Type: text/x-patch
Size: 1314 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libc-commits/attachments/20230701/735554fc/attachment.bin>