Fix the build after r231393
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 May 2018 04:41:24 +0000 (04:41 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 May 2018 04:41:24 +0000 (04:41 +0000)
​https://bugs.webkit.org/show_bug.cgi?id=185519
<rdar://problem/40131741>

* Configurations/WebKit.xcconfig:

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

Source/WebKit/ChangeLog
Source/WebKit/Configurations/WebKit.xcconfig

index 8adf65b..2384cd1 100644 (file)
@@ -1,3 +1,11 @@
+2018-05-10  Timothy Horton  <timothy_horton@apple.com>
+
+        Fix the build after r231393
+        ​https://bugs.webkit.org/show_bug.cgi?id=185519
+        <rdar://problem/40131741>
+
+        * Configurations/WebKit.xcconfig:
+
 2018-05-10  John Wilander  <wilander@apple.com>
 
         Storage Access API: Extend lifetime of cookies on successful user approval
index bfcb425..0c011f0 100644 (file)
@@ -154,8 +154,14 @@ WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphone*11.*] = YES;
 WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
 WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES = -Wl,-not_for_dyld_shared_cache;
 
-WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-WK_HAVE_URL_FORMATTING_COCOA_TOUCH_YES = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
-WK_HAVE_URL_FORMATTING_COCOA_TOUCH_NO = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
+WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_$(WK_PLATFORM_NAME));
+WK_HAVE_URL_FORMATTING_iphoneos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_iphoneminimalsimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_iphonesimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_watchos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_watchsimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_appletvos = NO
+WK_HAVE_URL_FORMATTING_appletvsimulator = NO;
+WK_HAVE_URL_FORMATTING_macosx = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
 WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES;
 WK_HAVE_URL_FORMATTING_IOS_SINCE_12 = YES;