commit 6501da5d9efd585f38613665c05cd2c5dda52074
author jer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Apr 26 21:40:31 2018 +0000
committer jer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Apr 26 21:40:31 2018 +0000
tree e92f937c076526ab51812cfe3f47e7c98aab6a3f
parent 789409986eaebda7fe9ee316a1783f0f5a57c21c

WK_COCOA_TOUCH the WK_ACCESSIBILITY_LDFLAGS
https://bugs.webkit.org/show_bug.cgi?id=185007
<rdar://problem/39735943>

Reviewed by Timothy Hatcher.

* Configurations/WebKit.xcconfig:


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

Source/WebKit/ChangeLog

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index d2f0e54..74f10c6 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2018-04-26  Jer Noble  <jer.noble@apple.com>
 
+        WK_COCOA_TOUCH the WK_ACCESSIBILITY_LDFLAGS
+        https://bugs.webkit.org/show_bug.cgi?id=185007
+        <rdar://problem/39735943>
+
+        Reviewed by Timothy Hatcher.
+
+        * Configurations/WebKit.xcconfig:
+
+2018-04-26  Jer Noble  <jer.noble@apple.com>
+
         Unreviewed build fix; fix iOS TAPI build step after r231063.
 
         * Configurations/WebKit.xcconfig:

Source/WebKit/Configurations/WebKit.xcconfig

diff --git a/Source/WebKit/Configurations/WebKit.xcconfig b/Source/WebKit/Configurations/WebKit.xcconfig
index ab8770e..66348a4 100644
--- a/Source/WebKit/Configurations/WebKit.xcconfig
+++ b/Source/WebKit/Configurations/WebKit.xcconfig
@@ -39,12 +39,9 @@
 
 LIBRARY_SEARCH_PATHS = $(inherited) "$(LIBWEBRTC_LIBRARY_DIR)";
 
-WK_ACCESSIBILITY_LDFLAGS = $(WK_ACCESSIBILITY_LDFLAGS_$(WK_PLATFORM_NAME));
-WK_ACCESSIBILITY_LDFLAGS_iphoneos = -lAccessibility;
-WK_ACCESSIBILITY_LDFLAGS_iphonesimulator = $(WK_ACCESSIBILITY_LDFLAGS_iphoneos);
-WK_ACCESSIBILITY_LDFLAGS_watchos = $(WK_ACCESSIBILITY_LDFLAGS_iphoneos);
-WK_ACCESSIBILITY_LDFLAGS_appletvos = $(WK_ACCESSIBILITY_LDFLAGS_iphoneos);
-WK_ACCESSIBILITY_LDFLAGS_macosx = $(WK_ACCESSIBILITY_LDFLAGS$(WK_MACOS_1014));
+WK_ACCESSIBILITY_LDFLAGS = $(WK_ACCESSIBILITY_LDFLAGS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
+WK_ACCESSIBILITY_LDFLAGS_COCOA_TOUCH_YES = -lAccessibility;
+WK_ACCESSIBILITY_LDFLAGS_COCOA_TOUCH_NO = $(WK_ACCESSIBILITY_LDFLAGS$(WK_MACOS_1014));
 WK_ACCESSIBILITY_LDFLAGS_MACOS_SINCE_1014 = -weak_library /usr/lib/libAccessibility.dylib;
 
 WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));