[libc-commits] [libc] 6d92f40 - [libc][Obvious] Fix cmake usage of list PREPEND (unavailable pre-3.15).

Tue Ly via libc-commits libc-commits at lists.llvm.org
Sun May 8 11:00:00 PDT 2022


Author: Tue Ly
Date: 2022-05-08T13:58:05-04:00
New Revision: 6d92f4022dcf8b9a6d1479e612db56341090c9a4

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

LOG: [libc][Obvious] Fix cmake usage of list PREPEND (unavailable pre-3.15).

Added: 
    

Modified: 
    libc/cmake/modules/LLVMLibCTestRules.cmake

Removed: 
    


################################################################################
diff  --git a/libc/cmake/modules/LLVMLibCTestRules.cmake b/libc/cmake/modules/LLVMLibCTestRules.cmake
index 3a1b9891e988..b1a34fed63b7 100644
--- a/libc/cmake/modules/LLVMLibCTestRules.cmake
+++ b/libc/cmake/modules/LLVMLibCTestRules.cmake
@@ -147,7 +147,7 @@ function(add_libc_unittest target_name)
   endif()
 
   # Test object files will depend on LINK_LIBRARIES passed down from `add_fp_unittest`
-  list(PREPEND LIBC_UNITTEST_LINK_LIBRARIES ${link_object_files})
+  set(link_libraries ${link_object_files} ${LIBC_UNITTEST_LINK_LIBRARIES})
 
   set_target_properties(${fq_target_name}
     PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
@@ -159,12 +159,12 @@ function(add_libc_unittest target_name)
 
   # LibcUnitTest and libc_test_utils should not depend on anything in LINK_LIBRARIES.
   if(NO_LIBC_UNITTEST_TEST_MAIN)
-    list(APPEND LIBC_UNITTEST_LINK_LIBRARIES LibcUnitTest libc_test_utils)
+    list(APPEND link_libraries LibcUnitTest libc_test_utils)
   else()
-    list(APPEND LIBC_UNITTEST_LINK_LIBRARIES LibcUnitTest LibcUnitTestMain libc_test_utils)
+    list(APPEND link_libraries LibcUnitTest LibcUnitTestMain libc_test_utils)
   endif()
 
-  target_link_libraries(${fq_target_name} PRIVATE ${LIBC_UNITTEST_LINK_LIBRARIES})
+  target_link_libraries(${fq_target_name} PRIVATE ${link_libraries})
 
   if(NOT LIBC_UNITTEST_NO_RUN_POSTBUILD)
     add_custom_command(


        


More information about the libc-commits mailing list