Changeset 197636 in webkit

Timestamp:

Mar 6, 2016, 12:33:29 AM (11 years ago)

Author:

ap@apple.com

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-layouttestrelay (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-03-06  Alexey Proskuryakov  <ap@apple.com>
+
+        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  <timothy_horton@apple.com>
 

trunk/Tools/Scripts/build-layouttestrelay

@@ -61 +61 @@
 #        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));

trunk/Tools/Scripts/webkitdirs.pm

@@ -1749 +1749 @@
     }
 
-    push(@extraOptions, ("-sdk", xcodeSDK())) if isIOSWebKit();
-
     chomp($ENV{DSYMUTIL_NUM_THREADS} = `sysctl -n hw.activecpu`);
     return system "xcodebuild", "-project", "$project.xcodeproj", @extraOptions;