Title: [197636] trunk/Tools
- Revision
- 197636
- Author
- [email protected]
- Date
- 2016-03-06 00:33:29 -0800 (Sun, 06 Mar 2016)
Log Message
build-webkit prints an error on iOS simulator bots
https://bugs.webkit.org/show_bug.cgi?id=155078
Reviewed by Dan Bernstein.
This happens when build-layouttestrelay sets $xcodeSDK to undefined, to use host SDK.
* Scripts/webkitdirs.pm: (buildXCodeProject): There is no need to pass -sdk, because
XcodeOptions() already passes SDKROOT as appropriate.
* Scripts/build-layouttestrelay: Added a FIXME. Resetting $xcodeSDK doesn't reset
any other configuration variables that were derived from its initial value, like $portName.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (197635 => 197636)
--- trunk/Tools/ChangeLog 2016-03-06 07:46:06 UTC (rev 197635)
+++ trunk/Tools/ChangeLog 2016-03-06 08:33:29 UTC (rev 197636)
@@ -1,3 +1,18 @@
+2016-03-06 Alexey Proskuryakov <[email protected]>
+
+ build-webkit prints an error on iOS simulator bots
+ https://bugs.webkit.org/show_bug.cgi?id=155078
+
+ Reviewed by Dan Bernstein.
+
+ This happens when build-layouttestrelay sets $xcodeSDK to undefined, to use host SDK.
+
+ * Scripts/webkitdirs.pm: (buildXCodeProject): There is no need to pass -sdk, because
+ XcodeOptions() already passes SDKROOT as appropriate.
+
+ * Scripts/build-layouttestrelay: Added a FIXME. Resetting $xcodeSDK doesn't reset
+ any other configuration variables that were derived from its initial value, like $portName.
+
2016-03-05 Tim Horton <[email protected]>
Create a DOMHTMLVideoElement when wrapping <video> elements
Modified: trunk/Tools/Scripts/build-layouttestrelay (197635 => 197636)
--- trunk/Tools/Scripts/build-layouttestrelay 2016-03-06 07:46:06 UTC (rev 197635)
+++ trunk/Tools/Scripts/build-layouttestrelay 2016-03-06 08:33:29 UTC (rev 197636)
@@ -60,6 +60,8 @@
# 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() && !willUseIOSDeviceSDK()) {
+ # FIXME: Changing SDK at this point results in an inconsistent webkitdirs state.
+ # We should make it so that webkitdirs functions never see the wrong SDK.
setXcodeSDK(undef); # Force use of Mac SDK if --ios-simulator was passed
exit exitStatus(buildXCodeProject("LayoutTestRelay", $clean, XcodeOptions(), @ARGV));
}
Modified: trunk/Tools/Scripts/webkitdirs.pm (197635 => 197636)
--- trunk/Tools/Scripts/webkitdirs.pm 2016-03-06 07:46:06 UTC (rev 197635)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-03-06 08:33:29 UTC (rev 197636)
@@ -1748,8 +1748,6 @@
push(@extraOptions, "clean");
}
- push(@extraOptions, ("-sdk", xcodeSDK())) if isIOSWebKit();
-
chomp($ENV{DSYMUTIL_NUM_THREADS} = `sysctl -n hw.activecpu`);
return system "xcodebuild", "-project", "$project.xcodeproj", @extraOptions;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
