From 8841fe4f3b57865c97b540446c8020c1b57efd27 Mon Sep 17 00:00:00 2001 From: Sergey Rubanov Date: Thu, 5 Nov 2020 01:40:59 +0000 Subject: [PATCH] Fix JSC build on macOS Big Sur https://bugs.webkit.org/show_bug.cgi?id=218566 Patch by Sergey Rubanov on 2020-11-04 Reviewed by David Kilzer. * Source/cmake/WebKitFindPackage.cmake: Canonical link: https://commits.webkit.org/231242@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269410 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 9 +++++++++ Source/cmake/WebKitFindPackage.cmake | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ffa87778fe6d..2fba3b91b7d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2020-11-04 Sergey Rubanov + + Fix JSC build on macOS Big Sur + https://bugs.webkit.org/show_bug.cgi?id=218566 + + Reviewed by David Kilzer. + + * Source/cmake/WebKitFindPackage.cmake: + 2020-11-04 Michael Catanzaro Add new build option USE(64KB_PAGE_BLOCK) diff --git a/Source/cmake/WebKitFindPackage.cmake b/Source/cmake/WebKitFindPackage.cmake index a35d15a4f49a..62f50c282a7d 100644 --- a/Source/cmake/WebKitFindPackage.cmake +++ b/Source/cmake/WebKitFindPackage.cmake @@ -91,10 +91,10 @@ macro(find_package package) set(ICU_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ICU/Headers) - # Apple just has a single dylib for ICU - set(ICU_I18N_LIBRARY /usr/lib/libicucore.dylib) - set(ICU_UC_LIBRARY /usr/lib/libicucore.dylib) - set(ICU_DATA_LIBRARY /usr/lib/libicucore.dylib) + # Apple just has a single tbd/dylib for ICU. + find_library(ICU_I18N_LIBRARY icucore) + find_library(ICU_UC_LIBRARY icucore) + find_library(ICU_DATA_LIBRARY icucore) set(ICU_LIBRARIES ${ICU_UC_LIBRARY}) set(ICU_FOUND ON)