Title: [228007] trunk/Source/WTF
- Revision
- 228007
- Author
- annu...@yandex.ru
- Date
- 2018-02-02 07:02:04 -0800 (Fri, 02 Feb 2018)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (228006 => 228007)
--- trunk/Source/WTF/ChangeLog 2018-02-02 13:54:14 UTC (rev 228006)
+++ trunk/Source/WTF/ChangeLog 2018-02-02 15:02:04 UTC (rev 228007)
@@ -1,3 +1,15 @@
+2018-02-02 Konstantin Tokarev <annu...@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.fu...@sony.com>
[GTK] fast/events/message-channel-gc-4.html is flaky
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (228006 => 228007)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2018-02-02 13:54:14 UTC (rev 228006)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2018-02-02 15:02:04 UTC (rev 228007)
@@ -445,6 +445,15 @@
${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 ()
Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (228006 => 228007)
--- trunk/Source/WTF/wtf/PlatformMac.cmake 2018-02-02 13:54:14 UTC (rev 228006)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2018-02-02 15:02:04 UTC (rev 228007)
@@ -22,7 +22,6 @@
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_PRIVATE_INCLUDE_DIRECTORIES
"${WTF_DIR}/icu"
- "${WTF_DIR}/wtf/spi/darwin"
${DERIVED_SOURCES_WTF_DIR}
)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
