Title: [283266] trunk/Tools
- Revision
- 283266
- Author
- [email protected]
- Date
- 2021-09-29 14:58:18 -0700 (Wed, 29 Sep 2021)
Log Message
[PlayStation] Make build-webkit configurable using environment variable
https://bugs.webkit.org/show_bug.cgi?id=230958
Reviewed by Fujii Hironori.
The cmake toolchain file is hard coded in the script. Make it configurable using
environment variable.
* Scripts/webkitdirs.pm:
(generateBuildSystemFromCMakeProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (283265 => 283266)
--- trunk/Tools/ChangeLog 2021-09-29 21:52:58 UTC (rev 283265)
+++ trunk/Tools/ChangeLog 2021-09-29 21:58:18 UTC (rev 283266)
@@ -1,3 +1,16 @@
+2021-09-29 Basuke Suzuki <[email protected]>
+
+ [PlayStation] Make build-webkit configurable using environment variable
+ https://bugs.webkit.org/show_bug.cgi?id=230958
+
+ Reviewed by Fujii Hironori.
+
+ The cmake toolchain file is hard coded in the script. Make it configurable using
+ environment variable.
+
+ * Scripts/webkitdirs.pm:
+ (generateBuildSystemFromCMakeProject):
+
2021-09-29 Youenn Fablet <[email protected]>
WPT importer should create serviceworker template for templated test that have worker as global
Modified: trunk/Tools/Scripts/webkitdirs.pm (283265 => 283266)
--- trunk/Tools/Scripts/webkitdirs.pm 2021-09-29 21:52:58 UTC (rev 283265)
+++ trunk/Tools/Scripts/webkitdirs.pm 2021-09-29 21:58:18 UTC (rev 283266)
@@ -2511,7 +2511,10 @@
push @args, "-DLTO_MODE=$ltoMode" if ltoMode();
- push @args, '-DCMAKE_TOOLCHAIN_FILE=Platform/PlayStation' if isPlayStation();
+ if (isPlayStation()) {
+ my $toolChainFile = $ENV{'CMAKE_TOOLCHAIN_FILE'} || "Platform/PlayStation";
+ push @args, '-DCMAKE_TOOLCHAIN_FILE=' . $toolChainFile;
+ }
if ($willUseNinja) {
push @args, "-G";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
