[JSCOnly] Fix build failures in macOS

https://bugs.webkit.org/show_bug.cgi?id=170887

Reviewed by Alex Christensen.

.:

Align ICU header configuration to MacCMake port.

* Source/cmake/OptionsJSCOnly.cmake:

Source/JavaScriptCore:

Align ICU header configuration to MacCMake port.

* PlatformJSCOnly.cmake:

Source/WTF:

JSCOnly port does not use mac/MainThread.cpp.
We change the ifdef gurard to use generic implementaion in JSCOnly on macOS.

* wtf/MainThread.cpp:
* wtf/PlatformJSCOnly.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@215408 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 8dbb6cc..06dd6fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2017-04-17  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [JSCOnly] Fix build failures in macOS
+        https://bugs.webkit.org/show_bug.cgi?id=170887
+
+        Reviewed by Alex Christensen.
+
+        Align ICU header configuration to MacCMake port.
+
+        * Source/cmake/OptionsJSCOnly.cmake:
+
 2017-04-16  Sam Weinig  <sam@webkit.org>
 
         [WebIDL] Switch IDLAttributes.txt over to a more structured format so that more information can be added for each attribute

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 03fe21d..8158c04 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2017-04-17  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [JSCOnly] Fix build failures in macOS
+        https://bugs.webkit.org/show_bug.cgi?id=170887
+
+        Reviewed by Alex Christensen.
+
+        Align ICU header configuration to MacCMake port.
+
+        * PlatformJSCOnly.cmake:
+
 2017-04-17  JF Bastien  <jfbastien@apple.com>
 
         B3: don't allow unsigned offsets in Value

diff --git a/Source/JavaScriptCore/PlatformJSCOnly.cmake b/Source/JavaScriptCore/PlatformJSCOnly.cmake
index 7b1e732..7e3c2fe 100644 (file)
--- a/Source/JavaScriptCore/PlatformJSCOnly.cmake
+++ b/Source/JavaScriptCore/PlatformJSCOnly.cmake
@@ -8,3 +8,9 @@ if (USE_GLIB)
         ${GLIB_LIBRARIES}
     )
 endif ()
+
+if (APPLE)
+    list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+        ${JAVASCRIPTCORE_DIR}/icu
+    )
+endif ()

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 5eb1b0a..e9e6920 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,16 @@
+2017-04-17  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [JSCOnly] Fix build failures in macOS
+        https://bugs.webkit.org/show_bug.cgi?id=170887
+
+        Reviewed by Alex Christensen.
+
+        JSCOnly port does not use mac/MainThread.cpp.
+        We change the ifdef gurard to use generic implementaion in JSCOnly on macOS.
+
+        * wtf/MainThread.cpp:
+        * wtf/PlatformJSCOnly.cmake:
+
 2017-04-17  JF Bastien  <jfbastien@apple.com>
 
         B3: don't allow unsigned offsets in Value

diff --git a/Source/WTF/wtf/MainThread.cpp b/Source/WTF/wtf/MainThread.cpp
index 0249544..a8f0ba7 100644 (file)
--- a/Source/WTF/wtf/MainThread.cpp
+++ b/Source/WTF/wtf/MainThread.cpp
@@ -41,7 +41,7 @@
 namespace WTF {
 
 static bool callbacksPaused; // This global variable is only accessed from main thread.
-#if !OS(DARWIN) && !USE(GLIB)
+#if !PLATFORM(COCOA) && !USE(GLIB)
 static ThreadIdentifier mainThreadIdentifier;
 #endif
 
@@ -53,7 +53,7 @@ static Deque<Function<void ()>>& functionQueue()
     return functionQueue;
 }
 
-#if OS(DARWIN) || USE(GLIB)
+#if PLATFORM(COCOA) || USE(GLIB)
 static pthread_once_t initializeMainThreadKeyOnce = PTHREAD_ONCE_INIT;
 
 static void initializeMainThreadOnce()
@@ -178,7 +178,7 @@ void setMainThreadCallbacksPaused(bool paused)
         scheduleDispatchFunctionsOnMainThread();
 }
 
-#if !OS(DARWIN) && !USE(GLIB)
+#if !PLATFORM(COCOA) && !USE(GLIB)
 bool isMainThread()
 {
     return currentThread() == mainThreadIdentifier;

diff --git a/Source/WTF/wtf/PlatformJSCOnly.cmake b/Source/WTF/wtf/PlatformJSCOnly.cmake
index 70019a1..9d84958 100644 (file)
--- a/Source/WTF/wtf/PlatformJSCOnly.cmake
+++ b/Source/WTF/wtf/PlatformJSCOnly.cmake
@@ -38,3 +38,9 @@ endif ()
 list(APPEND WTF_LIBRARIES
     ${CMAKE_THREAD_LIBS_INIT}
 )
+
+if (APPLE)
+    list(APPEND WTF_INCLUDE_DIRECTORIES
+        "${WTF_DIR}/icu"
+    )
+endif ()

diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
index ad45a62..cc002ea 100644 (file)
--- a/Source/cmake/OptionsJSCOnly.cmake
+++ b/Source/cmake/OptionsJSCOnly.cmake
@@ -47,11 +47,6 @@ endif ()
 if (NOT APPLE)
     find_package(ICU REQUIRED)
 else ()
-    set(ICU_INCLUDE_DIRS
-        "${WEBCORE_DIR}/icu"
-        "${JAVASCRIPTCORE_DIR}/icu"
-        "${WTF_DIR}/icu"
-    )
     set(ICU_LIBRARIES libicucore.dylib)
 endif ()