Stop building LayoutTestRelay for now. It's a Mac project, but build-webkit tries to

use iOS SDK, like with all the others.

* Scripts/build-webkit:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190419 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index a4d24fb..a852b30 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-01  Alexey Proskuryakov  <ap@apple.com>
+
+        Stop building LayoutTestRelay for now. It's a Mac project, but build-webkit tries to
+        use iOS SDK, like with all the others.
+
+        * Scripts/build-webkit:
+

 2015-10-01  Daniel Bates  <dabates@apple.com>
 
         Attempt to fix the iOS 9 Simulator testers
 2015-10-01  Daniel Bates  <dabates@apple.com>
 
         Attempt to fix the iOS 9 Simulator testers

diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index 8fc4826..8a6d7c3 100755 (executable)
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -193,8 +193,6 @@ if (isAppleMacWebKit()) {
         print(join(" ", @copyLibrariesArgs) . "\n");
         (system(@copyLibrariesArgs) == 0) or die;
     } else {
         print(join(" ", @copyLibrariesArgs) . "\n");
         (system(@copyLibrariesArgs) == 0) or die;
     } else {

-        push @projects, ("Tools/LayoutTestRelay") if willUseIOSSimulatorSDKWhenBuilding();
-

         my @copyLibrariesArgs = (
             "perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory",
             "--sdk", xcodeSDK(), "--wksi", "--llvm", "--prefer-system-llvm",
         my @copyLibrariesArgs = (
             "perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory",
             "--sdk", xcodeSDK(), "--wksi", "--llvm", "--prefer-system-llvm",