Title: [168735] branches/safari-538.34-branch/Tools
Diff
Modified: branches/safari-538.34-branch/Tools/ChangeLog (168734 => 168735)
--- branches/safari-538.34-branch/Tools/ChangeLog 2014-05-13 21:12:39 UTC (rev 168734)
+++ branches/safari-538.34-branch/Tools/ChangeLog 2014-05-13 21:14:39 UTC (rev 168735)
@@ -1,5 +1,16 @@
2014-05-13 Lucas Forschler <[email protected]>
+ Merge r168546
+
+ 2014-05-09 Anders Carlsson <[email protected]>
+
+ Another build fix.
+
+ * Scripts/build-webkit:
+ WebKit2 should always be built for OS X and iOS.
+
+2014-05-13 Lucas Forschler <[email protected]>
+
Merge r168545
2014-05-09 Anders Carlsson <[email protected]>
Modified: branches/safari-538.34-branch/Tools/Scripts/build-webkit (168734 => 168735)
--- branches/safari-538.34-branch/Tools/Scripts/build-webkit 2014-05-13 21:12:39 UTC (rev 168734)
+++ branches/safari-538.34-branch/Tools/Scripts/build-webkit 2014-05-13 21:14:39 UTC (rev 168735)
@@ -208,6 +208,8 @@
# ANGLE must come before WebCore
splice @projects, 0, 0, "Source/ThirdParty/ANGLE";
+ push @projects, ("Source/WebKit2");
+
if (!isIOSWebKit()) {
push @projects, ("Tools/MiniBrowser");
@@ -220,8 +222,6 @@
print(join(" ", @copyLibrariesArgs) . "\n");
(system(@copyLibrariesArgs) == 0) or die;
} else {
- push @projects, ("Source/WebKit2");
-
my @copyLibrariesArgs = (
"perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory",
"--sdk", xcodeSDK(), "--llvm", "--prefer-system-llvm",
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
