Changeset 287964 in webkit

Timestamp:

Jan 12, 2022, 5:17:23 PM (5 years ago)

Author:

Ryan Haddad

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

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Makefile (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/build-webkit (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-01-12  Ryan Haddad  <ryanhaddad@apple.com>
+
+        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  <commit-queue@webkit.org>
 

trunk/Source/WebKit/Makefile

@@ -1 @@
-export XCODE_TARGET = -target WebKit -target WebKitSwift
 include ../Makefile.shared

trunk/Tools/ChangeLog

@@ +1 @@
+2022-01-12  Ryan Haddad  <ryanhaddad@apple.com>
+
+        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  <j_pascoe@apple.com>
 

trunk/Tools/Scripts/build-webkit

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