Title: [190554] trunk/Tools
- Revision
- 190554
- Author
- [email protected]
- Date
- 2015-10-04 15:30:17 -0700 (Sun, 04 Oct 2015)
Log Message
Fix the Apple Internal iOS build after <http://trac.webkit.org/changeset/190515>
(https://bugs.webkit.org/show_bug.cgi?id=149753)
For now, support calling build-layouttestrelay without --ios-simulator so long
as we are building on a Mac.
* Scripts/build-layouttestrelay:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (190553 => 190554)
--- trunk/Tools/ChangeLog 2015-10-04 20:49:17 UTC (rev 190553)
+++ trunk/Tools/ChangeLog 2015-10-04 22:30:17 UTC (rev 190554)
@@ -1,3 +1,13 @@
+2015-10-04 Daniel Bates <[email protected]>
+
+ Fix the Apple Internal iOS build after <http://trac.webkit.org/changeset/190515>
+ (https://bugs.webkit.org/show_bug.cgi?id=149753)
+
+ For now, support calling build-layouttestrelay without --ios-simulator so long
+ as we are building on a Mac.
+
+ * Scripts/build-layouttestrelay:
+
2015-10-04 Alexey Proskuryakov <[email protected]>
Support Trac 1.0.x XML timeline link format
Modified: trunk/Tools/Scripts/build-layouttestrelay (190553 => 190554)
--- trunk/Tools/Scripts/build-layouttestrelay 2015-10-04 20:49:17 UTC (rev 190553)
+++ trunk/Tools/Scripts/build-layouttestrelay 2015-10-04 22:30:17 UTC (rev 190554)
@@ -56,8 +56,11 @@
chdir "Tools/LayoutTestRelay" or die;
-if (isIOSWebKit() && willUseIOSSimulatorSDKWhenBuilding()) {
- setXcodeSDK(undef); # Force use of Mac SDK
+# FIXME: This tool is only useful when building WebKit for iOS Simulator. For now,
+# to avoid breaking some Apple Internal tools we support calling this script
+# without --ios-simulator so long as we are building on a Mac.
+if (isAppleMacWebKit() && !willUseIOSDeviceSDKWhenBuilding()) {
+ setXcodeSDK(undef); # Force use of Mac SDK if --ios-simulator was passed
exit exitStatus(buildXCodeProject("LayoutTestRelay", $clean, XcodeOptions(), @ARGV));
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
