Title: [161845] trunk/Tools
- Revision
- 161845
- Author
- [email protected]
- Date
- 2014-01-12 17:38:07 -0800 (Sun, 12 Jan 2014)
Log Message
[iOS] Fix the build
For now, ensure we build WebKit System Interface before we build WebKit.
We'll remove this constraint and the constraint to build WebKit Additions
in a subsequent commit.
* Scripts/build-webkit:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (161844 => 161845)
--- trunk/Tools/ChangeLog 2014-01-13 01:28:53 UTC (rev 161844)
+++ trunk/Tools/ChangeLog 2014-01-13 01:38:07 UTC (rev 161845)
@@ -1,3 +1,13 @@
+2014-01-12 Daniel Bates <[email protected]>
+
+ [iOS] Fix the build
+
+ For now, ensure we build WebKit System Interface before we build WebKit.
+ We'll remove this constraint and the constraint to build WebKit Additions
+ in a subsequent commit.
+
+ * Scripts/build-webkit:
+
2014-01-12 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix make distcheck.
Modified: trunk/Tools/Scripts/build-webkit (161844 => 161845)
--- trunk/Tools/Scripts/build-webkit 2014-01-13 01:28:53 UTC (rev 161844)
+++ trunk/Tools/Scripts/build-webkit 2014-01-13 01:38:07 UTC (rev 161845)
@@ -238,9 +238,12 @@
$ENV{ENABLE_LLINT_C_LOOP} = 1 if $forceCLoop;
if (isIOSWebKit()) {
+ # FIXME: Remove the inclusion of both WebKit System Interface and WebKit Additions projects
+ # once the iOS build is stable.
+
# WebKitSystemInterface should always be built just before WebKit.
my $webKitIndex = first { $projects[$_] eq "Source/WebKit" } 0..$#projects;
- splice(@projects, $webKitIndex, 0, "WebKitSystemInterface");
+ splice(@projects, $webKitIndex, 0, "../Internal/WebKitSystemInterface");
# WebKitAdditions must come before WebCore
splice(@projects, 0, 0, "../Internal/WebKitAdditions");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
