Title: [227752] trunk/Source/WebKit
- Revision
- 227752
- Author
- [email protected]
- Date
- 2018-01-29 13:32:41 -0800 (Mon, 29 Jan 2018)
Log Message
Warning in 32-bit WebKit build when trying to link to SafariSafeBrowsing
https://bugs.webkit.org/show_bug.cgi?id=182251
rdar://problem/36964995
Patch by Zach Li <[email protected]> on 2018-01-29
Reviewed by Alex Christensen.
* Configurations/WebKit.xcconfig:
Only link against SafariSafeBrowsing framework in 64-bit architecture.
* Platform/spi/Cocoa/SafeBrowsingSPI.h:
Guard the Safe Browsing code with WK_API_ENABLED.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (227751 => 227752)
--- trunk/Source/WebKit/ChangeLog 2018-01-29 21:20:49 UTC (rev 227751)
+++ trunk/Source/WebKit/ChangeLog 2018-01-29 21:32:41 UTC (rev 227752)
@@ -1,3 +1,17 @@
+2018-01-29 Zach Li <[email protected]>
+
+ Warning in 32-bit WebKit build when trying to link to SafariSafeBrowsing
+ https://bugs.webkit.org/show_bug.cgi?id=182251
+ rdar://problem/36964995
+
+ Reviewed by Alex Christensen.
+
+ * Configurations/WebKit.xcconfig:
+ Only link against SafariSafeBrowsing framework in 64-bit architecture.
+
+ * Platform/spi/Cocoa/SafeBrowsingSPI.h:
+ Guard the Safe Browsing code with WK_API_ENABLED.
+
2018-01-29 Chris Dumez <[email protected]>
Make sure we do not re-enter Webcore during StorageToWebProcessConnection::EstablishSWServerConnection Sync IPC
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (227751 => 227752)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2018-01-29 21:20:49 UTC (rev 227751)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2018-01-29 21:32:41 UTC (rev 227752)
@@ -90,5 +90,6 @@
WK_SAFE_BROWSING_LDFLAGS[sdk=iphone*10.*] = ;
WK_SAFE_BROWSING_LDFLAGS[sdk=watch*] = ;
WK_SAFE_BROWSING_LDFLAGS[sdk=appletv*] = ;
-WK_SAFE_BROWSING_LDFLAGS[sdk=macosx*] = $(WK_SAFE_BROWSING_LDFLAGS$(WK_MACOS_1013));
+WK_SAFE_BROWSING_LDFLAGS[sdk=macosx*] = $(WK_SAFE_BROWSING_LDFLAGS_macosx);
+WK_SAFE_BROWSING_LDFLAGS_macosx[arch=x86_64] = $(WK_SAFE_BROWSING_LDFLAGS$(WK_MACOS_1013));
WK_SAFE_BROWSING_LDFLAGS_MACOS_SINCE_1013 = -weak_framework SafariSafeBrowsing;
Modified: trunk/Source/WebKit/Platform/spi/Cocoa/SafeBrowsingSPI.h (227751 => 227752)
--- trunk/Source/WebKit/Platform/spi/Cocoa/SafeBrowsingSPI.h 2018-01-29 21:20:49 UTC (rev 227751)
+++ trunk/Source/WebKit/Platform/spi/Cocoa/SafeBrowsingSPI.h 2018-01-29 21:32:41 UTC (rev 227752)
@@ -25,7 +25,7 @@
#pragma once
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
+#if WK_API_ENABLED && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000))
#import <Foundation/Foundation.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
