From 146cdc86b7345ac8f513fdf649979e80db01a2ca Mon Sep 17 00:00:00 2001 From: Alberto Garcia Date: Tue, 2 Jun 2026 07:24:38 -0700 Subject: [PATCH] REGRESSION(313606@main): Fails to build with system malloc https://bugs.webkit.org/show_bug.cgi?id=316083 Reviewed by Fujii Hironori. Don't add bmalloc_CopyHeaders to LLIntOffsetsExtractor_DEPENDENCIES if USE_SYSTEM_MALLOC is on. * Source/JavaScriptCore/CMakeLists.txt: Canonical link: https://commits.webkit.org/305877.698@webkitglib/2.52 Upstream: https://github.com/WebKit/WebKit/commit/a6bc685a685c8f16c919dc6310a62a26971d396e Signed-off-by: Thomas Devoogdt --- Source/JavaScriptCore/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt index a2a6d724608a..ea9ea17802f2 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt @@ -412,8 +412,10 @@ set(LLIntSettingsExtractor_DEPENDENCIES JavaScriptCore_CopyHeaders JavaScriptCore_CopyPrivateHeaders WTF_CopyHeaders - bmalloc_CopyHeaders ) +if (NOT USE_SYSTEM_MALLOC) + list(APPEND LLIntSettingsExtractor_DEPENDENCIES bmalloc_CopyHeaders) +endif () WEBKIT_EXECUTABLE(LLIntSettingsExtractor) # LLIntSettingsExtractor target needs to have a direct or indirect @@ -439,8 +441,10 @@ set(LLIntOffsetsExtractor_DEPENDENCIES JavaScriptCore_CopyHeaders JavaScriptCore_CopyPrivateHeaders WTF_CopyHeaders - bmalloc_CopyHeaders ) +if (NOT USE_SYSTEM_MALLOC) + list(APPEND LLIntOffsetsExtractor_DEPENDENCIES bmalloc_CopyHeaders) +endif () WEBKIT_EXECUTABLE(LLIntOffsetsExtractor) # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than -- 2.43.0