Unreviewed build fix for JSCOnly on macOS after r227845.
authorannulen@yandex.ru <annulen@yandex.ru@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Feb 2018 15:02:04 +0000 (15:02 +0000)
committerannulen@yandex.ru <annulen@yandex.ru@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Feb 2018 15:02:04 +0000 (15:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=182274

Reverted part of r227845 that moved CommonCryptoSPI.h
handling into PlatformMac, because it is needed for all
ports which can be built on macOS.

* wtf/CMakeLists.txt:
* wtf/PlatformMac.cmake:

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

Source/WTF/ChangeLog
Source/WTF/wtf/CMakeLists.txt
Source/WTF/wtf/PlatformMac.cmake

index 5425480..c606434 100644 (file)
@@ -1,3 +1,15 @@
+2018-02-02  Konstantin Tokarev  <annulen@yandex.ru>
+
+        Unreviewed build fix for JSCOnly on macOS after r227845.
+        https://bugs.webkit.org/show_bug.cgi?id=182274
+
+        Reverted part of r227845 that moved CommonCryptoSPI.h
+        handling into PlatformMac, because it is needed for all
+        ports which can be built on macOS.
+
+        * wtf/CMakeLists.txt:
+        * wtf/PlatformMac.cmake:
+
 2018-02-02  Fujii Hironori  <Hironori.Fujii@sony.com>
 
         [GTK] fast/events/message-channel-gc-4.html is flaky
index c10bae9..ce5f4f7 100644 (file)
@@ -445,6 +445,15 @@ set(WTF_LIBRARIES
     ${CMAKE_DL_LIBS}
 )
 
+if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    list(APPEND WTF_HEADERS
+        spi/darwin/CommonCryptoSPI.h
+    )
+list(APPEND WTF_PRIVATE_INCLUDE_DIRECTORIES
+        "${WTF_DIR}/wtf/spi/darwin"
+    )
+endif ()
+
 if (NOT USE_SYSTEM_MALLOC)
     list(APPEND WTF_LIBRARIES bmalloc)
 endif ()
index 273cc41..418fd32 100644 (file)
@@ -22,7 +22,6 @@ list(APPEND WTF_HEADERS
     spi/cocoa/NSMapTableSPI.h
     spi/cocoa/SecuritySPI.h
 
-    spi/darwin/CommonCryptoSPI.h
     spi/darwin/SandboxSPI.h
     spi/darwin/XPCSPI.h
     spi/darwin/dyldSPI.h
@@ -62,7 +61,6 @@ list(APPEND WTF_SOURCES
 
 list(APPEND WTF_PRIVATE_INCLUDE_DIRECTORIES
     "${WTF_DIR}/icu"
-    "${WTF_DIR}/wtf/spi/darwin"
     ${DERIVED_SOURCES_WTF_DIR}
 )