From 157465941dee6ef7865090db5ec06f2b6f26d6f7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 15:09:02 -0700 Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols for musl Signed-off-by: Khem Raj --- chromium/base/allocator/allocator_shim.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc index ef42d5ad67f..626e4c996a5 100644 --- a/chromium/base/allocator/allocator_shim.cc +++ b/chromium/base/allocator/allocator_shim.cc @@ -352,7 +352,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) { // In the case of tcmalloc we also want to plumb into the glibc hooks // to avoid that allocations made in glibc itself (e.g., strdup()) get // accidentally performed on the glibc heap instead of the tcmalloc one. -#if BUILDFLAG(USE_TCMALLOC) +#if BUILDFLAG(USE_TCMALLOC) && defined(__GLIBC__) #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" #endif