robot-piglet 1 год назад
Родитель
Сommit
e667f88560

+ 3 - 1
contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin-x86_64.txt

@@ -17,7 +17,6 @@ target_include_directories(llvm-tblgen PRIVATE
 )
 target_link_libraries(llvm-tblgen PUBLIC
   contrib-libs-cxxsupp
-  cpp-malloc-system
   contrib-libs-llvm12
   llvm12-lib-Demangle
   llvm12-lib-Support
@@ -83,4 +82,7 @@ target_sources(llvm-tblgen PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/X86ModRMFilters.cpp
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/X86RecognizableInstr.cpp
 )
+target_allocator(llvm-tblgen
+  system_allocator
+)
 vcs_info(llvm-tblgen)

+ 3 - 1
contrib/libs/llvm12/utils/TableGen/CMakeLists.linux-aarch64.txt

@@ -18,7 +18,6 @@ target_include_directories(llvm-tblgen PRIVATE
 target_link_libraries(llvm-tblgen PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  cpp-malloc-jemalloc
   contrib-libs-llvm12
   llvm12-lib-Demangle
   llvm12-lib-Support
@@ -89,4 +88,7 @@ target_sources(llvm-tblgen PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/X86ModRMFilters.cpp
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/X86RecognizableInstr.cpp
 )
+target_allocator(llvm-tblgen
+  cpp-malloc-jemalloc
+)
 vcs_info(llvm-tblgen)

+ 4 - 2
contrib/libs/llvm12/utils/TableGen/CMakeLists.linux-x86_64.txt

@@ -18,8 +18,6 @@ target_include_directories(llvm-tblgen PRIVATE
 target_link_libraries(llvm-tblgen PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   contrib-libs-llvm12
   llvm12-lib-Demangle
   llvm12-lib-Support
@@ -90,4 +88,8 @@ target_sources(llvm-tblgen PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/X86ModRMFilters.cpp
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/X86RecognizableInstr.cpp
 )
+target_allocator(llvm-tblgen
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(llvm-tblgen)

+ 3 - 1
contrib/libs/llvm12/utils/TableGen/CMakeLists.windows-x86_64.txt

@@ -17,7 +17,6 @@ target_include_directories(llvm-tblgen PRIVATE
 )
 target_link_libraries(llvm-tblgen PUBLIC
   contrib-libs-cxxsupp
-  cpp-malloc-system
   contrib-libs-llvm12
   llvm12-lib-Demangle
   llvm12-lib-Support
@@ -78,4 +77,7 @@ target_sources(llvm-tblgen PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/X86ModRMFilters.cpp
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/X86RecognizableInstr.cpp
 )
+target_allocator(llvm-tblgen
+  system_allocator
+)
 vcs_info(llvm-tblgen)

+ 3 - 1
contrib/tools/protoc/bin/CMakeLists.darwin-x86_64.txt

@@ -14,7 +14,6 @@ target_compile_options(protoc PRIVATE
 target_link_libraries(protoc PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   contrib-libs-protoc
 )
@@ -26,4 +25,7 @@ target_link_options(protoc PRIVATE
 target_sources(protoc PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
 )
+target_allocator(protoc
+  system_allocator
+)
 vcs_info(protoc)

+ 3 - 1
contrib/tools/protoc/bin/CMakeLists.linux-aarch64.txt

@@ -15,7 +15,6 @@ target_link_libraries(protoc PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   contrib-libs-protoc
 )
 target_link_options(protoc PRIVATE
@@ -31,4 +30,7 @@ target_link_options(protoc PRIVATE
 target_sources(protoc PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
 )
+target_allocator(protoc
+  cpp-malloc-jemalloc
+)
 vcs_info(protoc)

+ 4 - 2
contrib/tools/protoc/bin/CMakeLists.linux-x86_64.txt

@@ -15,8 +15,6 @@ target_link_libraries(protoc PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   contrib-libs-protoc
 )
@@ -33,4 +31,8 @@ target_link_options(protoc PRIVATE
 target_sources(protoc PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
 )
+target_allocator(protoc
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(protoc)

+ 3 - 1
contrib/tools/protoc/bin/CMakeLists.windows-x86_64.txt

@@ -14,11 +14,13 @@ target_compile_options(protoc PRIVATE
 target_link_libraries(protoc PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   contrib-libs-protoc
 )
 target_sources(protoc PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
 )
+target_allocator(protoc
+  system_allocator
+)
 vcs_info(protoc)

+ 3 - 1
contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin-x86_64.txt

@@ -14,7 +14,6 @@ target_compile_options(cpp_styleguide PRIVATE
 target_link_libraries(cpp_styleguide PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   contrib-libs-protoc
 )
@@ -26,4 +25,7 @@ target_link_options(cpp_styleguide PRIVATE
 target_sources(cpp_styleguide PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
 )
+target_allocator(cpp_styleguide
+  system_allocator
+)
 vcs_info(cpp_styleguide)

+ 3 - 1
contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux-aarch64.txt

@@ -15,7 +15,6 @@ target_link_libraries(cpp_styleguide PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   contrib-libs-protoc
 )
 target_link_options(cpp_styleguide PRIVATE
@@ -31,4 +30,7 @@ target_link_options(cpp_styleguide PRIVATE
 target_sources(cpp_styleguide PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
 )
+target_allocator(cpp_styleguide
+  cpp-malloc-jemalloc
+)
 vcs_info(cpp_styleguide)

Некоторые файлы не были показаны из-за большого количества измененных файлов