Title: [295577] trunk/Tools/Scripts/build-webkit
- Revision
- 295577
- Author
- e...@apple.com
- Date
- 2022-06-15 15:46:32 -0700 (Wed, 15 Jun 2022)
Log Message
[build-webkit] Don't run build-imagediff when cleaning with Xcode
https://bugs.webkit.org/show_bug.cgi?id=241624
Reviewed by Jonathan Bedard.
Fixes "error: Unknown build action ' --clean'" from xcodebuild, as
build-webkit was passing the --clean argument to build-imagediff with an
extra space.
Since the move to XCBuild, cleaning deletes the whole build directory,
so there is nothing left for build-imagediff to clean and we skip this
step altogether.
* Tools/Scripts/build-webkit:
Canonical link: https://commits.webkit.org/251581@main
Modified Paths
Diff
Modified: trunk/Tools/Scripts/build-webkit (295576 => 295577)
--- trunk/Tools/Scripts/build-webkit 2022-06-15 22:46:27 UTC (rev 295576)
+++ trunk/Tools/Scripts/build-webkit 2022-06-15 22:46:32 UTC (rev 295577)
@@ -384,6 +384,11 @@
exit exitStatus($result);
}
+ if ($clean) {
+ # No need to have build-imagediff do cleaning, the build directory has already been deleted.
+ exit exitStatus($result);
+ }
+
# Build ImageDiff for host
my @command = File::Spec->catfile(getcwd(), "/Tools/Scripts/build-imagediff");
chdirWebKit();
@@ -391,9 +396,6 @@
die "build-imagediff script not found";
}
- if ($clean) {
- push @command, " --clean";
- }
push @command, argumentsForConfiguration();
push @command, @ARGV;
@command = extractNonMacOSHostConfiguration(\@command);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
