[libc-commits] [libc] 03731ed - [libc][obvious] only include vector with malloc

[Michael Jones via libc-commits]

Author: Michael Jones
Date: 2022-02-10T11:17:35-08:00
New Revision: 03731ed393004978f05ba7faad0c526182d15412

URL: https://github.com/llvm/llvm-project/commit/03731ed393004978f05ba7faad0c526182d15412
DIFF: https://github.com/llvm/llvm-project/commit/03731ed393004978f05ba7faad0c526182d15412.diff

LOG: [libc][obvious] only include vector with malloc

the vector class, due to being dynamically resized, needs malloc. This
fixes the build so that it only includes it when malloc should be
available.

Differential Revision: https://reviews.llvm.org/D119464

Added: 
    

Modified: 
    libc/src/__support/CPP/CMakeLists.txt
    libc/test/utils/CPP/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libc/src/__support/CPP/CMakeLists.txt b/libc/src/__support/CPP/CMakeLists.txt
index b591734a6b6f..8a61fc76922f 100644
--- a/libc/src/__support/CPP/CMakeLists.txt
+++ b/libc/src/__support/CPP/CMakeLists.txt
@@ -12,10 +12,12 @@ add_header_library(
     TypeTraits.h
 )
 
-add_header_library(
-  vector
-  HDRS
-    vector.h
-  DEPENDS
-    libc.include.stdlib
-)
+if(LLVM_LIBC_INCLUDE_SCUDO OR NOT LLVM_LIBC_FULL_BUILD)
+  add_header_library(
+    vector
+    HDRS
+      vector.h
+    DEPENDS
+      libc.include.stdlib
+  )
+endif()

diff  --git a/libc/test/utils/CPP/CMakeLists.txt b/libc/test/utils/CPP/CMakeLists.txt
index 7d4f15b7af5c..a02636a07abb 100644
--- a/libc/test/utils/CPP/CMakeLists.txt
+++ b/libc/test/utils/CPP/CMakeLists.txt
@@ -40,12 +40,14 @@ add_libc_unittest(
     libc.src.__support.CPP.standalone_cpp
 )
 
-add_libc_unittest(
-  vector_test
-  SUITE
-    libc_cpp_utils_unittests
-  SRCS
-    vector_test.cpp
-  DEPENDS
-    libc.src.__support.CPP.vector
-)
+if(LLVM_LIBC_INCLUDE_SCUDO OR NOT LLVM_LIBC_FULL_BUILD)
+  add_libc_unittest(
+    vector_test
+    SUITE
+      libc_cpp_utils_unittests
+    SRCS
+      vector_test.cpp
+    DEPENDS
+      libc.src.__support.CPP.vector
+  )
+endif()