1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
index b9a7caa4..b333dde9 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
-From fdf8296efde5c21e2a89045d18194caa619b4528 Mon Sep 17 00:00:00 2001
+From 30c93cab167ac356cd5340fadd207ba938733e39 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:54:38 -0700
 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
@@ -9,15 +9,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc
-index 5fb86467dde..9864858eb67 100644
+index 5ea77ef2d27..85343a13905 100644
 --- a/chromium/base/allocator/allocator_check.cc
 +++ b/chromium/base/allocator/allocator_check.cc
 @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() {
   // Set by allocator_shim_override_ucrt_symbols_win.h when the
   // shimmed _set_new_mode() is called.
   return g_is_win_shim_layer_initialized;
-#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \
+-#elif defined(OS_LINUX) && BUILDFLAG(USE_TCMALLOC) && \
-+#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \
+#elif defined(__GLIBC__) && BUILDFLAG(USE_TCMALLOC) && \
     !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
 // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.
 // TODO(primiano): replace with an include once base can depend on allocator.

diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch index b9a7caa4..b333dde9 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
1	From fdf8296efde5c21e2a89045d18194caa619b4528 Mon Sep 17 00:00:00 2001	1	From 30c93cab167ac356cd5340fadd207ba938733e39 Mon Sep 17 00:00:00 2001
2	From: Khem Raj <raj.khem@gmail.com>	2	From: Khem Raj <raj.khem@gmail.com>
3	Date: Fri, 7 Jul 2017 14:54:38 -0700	3	Date: Fri, 7 Jul 2017 14:54:38 -0700
4	Subject: [PATCH] chromium: musl: linux != glibc, make the distinction	4	Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
@@ -9,15 +9,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
9	1 file changed, 1 insertion(+), 1 deletion(-)	9	1 file changed, 1 insertion(+), 1 deletion(-)
10		10
11	diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc	11	diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc
12	index 5fb86467dde..9864858eb67 100644	12	index 5ea77ef2d27..85343a13905 100644
13	--- a/chromium/base/allocator/allocator_check.cc	13	--- a/chromium/base/allocator/allocator_check.cc
14	+++ b/chromium/base/allocator/allocator_check.cc	14	+++ b/chromium/base/allocator/allocator_check.cc
15	@@ -27,7 +27,7 @@ bool IsAllocatorInitialized() {	15	@@ -27,7 +27,7 @@ bool IsAllocatorInitialized() {
16	// Set by allocator_shim_override_ucrt_symbols_win.h when the	16	// Set by allocator_shim_override_ucrt_symbols_win.h when the
17	// shimmed _set_new_mode() is called.	17	// shimmed _set_new_mode() is called.
18	return g_is_win_shim_layer_initialized;	18	return g_is_win_shim_layer_initialized;
19	-#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \	19	-#elif defined(OS_LINUX) && BUILDFLAG(USE_TCMALLOC) && \
20	+#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \	20	+#elif defined(__GLIBC__) && BUILDFLAG(USE_TCMALLOC) && \
21	!defined(MEMORY_TOOL_REPLACES_ALLOCATOR)	21	!defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
22	// From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.	22	// From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.
23	// TODO(primiano): replace with an include once base can depend on allocator.	23	// TODO(primiano): replace with an include once base can depend on allocator.