From 6010a2e68782207a7e68dbb61ca3a57a1e999bc2 Mon Sep 17 00:00:00 2001
From: Taku Fukada <naninunenor@gmail.com>
Date: Fri, 28 Aug 2026 18:37:51 +0900
Subject: [PATCH] fix(core): update amalgam symbol filters for mln namespace
 rename (#4531)

---
 platform/linux/linux.cmake | 4 ++--
 platform/macos/macos.cmake | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/linux/linux.cmake b/platform/linux/linux.cmake
index 64f186abb..2f521661b 100644
--- a/platform/linux/linux.cmake
+++ b/platform/linux/linux.cmake
@@ -182,7 +182,7 @@ target_link_libraries(
 )
 
 if(MLN_CREATE_AMALGAMATION)
-    if ("${ARMERGE}" STREQUAL "MLN_CREATE_AMALGAMATION")
+    if(NOT ARMERGE)
         message(FATAL_ERROR "armerge required when MLN_CREATE_AMALGAMATION=ON")
     endif()
     message(STATUS "Found armerge: ${ARMERGE}")
@@ -218,7 +218,7 @@ if(MLN_CREATE_AMALGAMATION)
     add_custom_command(
         TARGET mbgl-core
         POST_BUILD
-        COMMAND armerge --keep-symbols 'mbgl.*' --output libmbgl-core-amalgam.a
+        COMMAND ${ARMERGE} --keep-symbols 'mln.*' --output libmbgl-core-amalgam.a
             $<TARGET_FILE:mbgl-core>
             $<TARGET_FILE:mbgl-freetype>
             $<TARGET_FILE:mbgl-vendor-csscolorparser>
diff --git a/platform/macos/macos.cmake b/platform/macos/macos.cmake
index 3fa95286e..5341a94e6 100644
--- a/platform/macos/macos.cmake
+++ b/platform/macos/macos.cmake
@@ -146,7 +146,7 @@ add_test(
 find_program(ARMERGE NAMES armerge)
 
 if(MLN_CREATE_AMALGAMATION)
-    if ("${ARMERGE}" STREQUAL "ARMERGE-NOTFOUND")
+    if(NOT ARMERGE)
         message(FATAL_ERROR "armerge required when MLN_CREATE_AMALGAMATION=ON")
     endif()
     message(STATUS "Found armerge: ${ARMERGE}")
@@ -161,7 +161,7 @@ if(MLN_CREATE_AMALGAMATION)
     add_custom_command(
         TARGET mbgl-core
         POST_BUILD
-        COMMAND armerge --keep-symbols 'mbgl.*' --output libmbgl-core-amalgam.a
+        COMMAND ${ARMERGE} --keep-symbols 'mln.*' --output libmbgl-core-amalgam.a
             $<TARGET_FILE:mbgl-core>
             $<TARGET_FILE:mbgl-freetype>
             $<TARGET_FILE:mbgl-vendor-csscolorparser>