Title: [287964] trunk
Revision
287964
Author
[email protected]
Date
2022-01-12 17:17:23 -0800 (Wed, 12 Jan 2022)

Log Message

Unreviewed, reverting r287944.

Breaks Monterey build.

Reverted changeset:

"Build WebKitSwift when building with make or build-webkit"
https://bugs.webkit.org/show_bug.cgi?id=235093
https://commits.webkit.org/r287944

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (287963 => 287964)


--- trunk/Source/WebKit/ChangeLog	2022-01-13 01:15:05 UTC (rev 287963)
+++ trunk/Source/WebKit/ChangeLog	2022-01-13 01:17:23 UTC (rev 287964)
@@ -1,3 +1,15 @@
+2022-01-12  Ryan Haddad  <[email protected]>
+
+        Unreviewed, reverting r287944.
+
+        Breaks Monterey build.
+
+        Reverted changeset:
+
+        "Build WebKitSwift when building with make or build-webkit"
+        https://bugs.webkit.org/show_bug.cgi?id=235093
+        https://commits.webkit.org/r287944
+
 2022-01-12  Commit Queue  <[email protected]>
 
         Unreviewed, reverting r287955.

Modified: trunk/Source/WebKit/Makefile (287963 => 287964)


--- trunk/Source/WebKit/Makefile	2022-01-13 01:15:05 UTC (rev 287963)
+++ trunk/Source/WebKit/Makefile	2022-01-13 01:17:23 UTC (rev 287964)
@@ -1,2 +1 @@
-export XCODE_TARGET = -target WebKit -target WebKitSwift
 include ../Makefile.shared

Modified: trunk/Tools/ChangeLog (287963 => 287964)


--- trunk/Tools/ChangeLog	2022-01-13 01:15:05 UTC (rev 287963)
+++ trunk/Tools/ChangeLog	2022-01-13 01:17:23 UTC (rev 287964)
@@ -1,3 +1,15 @@
+2022-01-12  Ryan Haddad  <[email protected]>
+
+        Unreviewed, reverting r287944.
+
+        Breaks Monterey build.
+
+        Reverted changeset:
+
+        "Build WebKitSwift when building with make or build-webkit"
+        https://bugs.webkit.org/show_bug.cgi?id=235093
+        https://commits.webkit.org/r287944
+
 2022-01-12  J Pascoe  <[email protected]>
 
         [WebAuthn] Fix freebie call without user gesture not being given

Modified: trunk/Tools/Scripts/build-webkit (287963 => 287964)


--- trunk/Tools/Scripts/build-webkit	2022-01-13 01:15:05 UTC (rev 287963)
+++ trunk/Tools/Scripts/build-webkit	2022-01-13 01:17:23 UTC (rev 287964)
@@ -350,12 +350,6 @@
         push @local_options, XcodeCoverageSupportOptions() if $coverageSupport;
         push @local_options, XcodeStaticAnalyzerOption() if $shouldRunStaticAnalyzer;
         push @local_options, "WK_LTO_MODE=$ltoMode" if ($ltoMode ne "default");
-
-        # FIXME: Move WebKitSwift to its own directory and remove this hack.
-        if ($dir eq "Source/WebKit") {
-            push @local_options, "-target", "WebKit", "-target", "WebKitSwift"
-        }
-
         my $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
         $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to