Changeset 283266 in webkit

Timestamp:

Sep 29, 2021, 2:58:18 PM (5 years ago)

Author:

basuke.suzuki@sony.com

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-09-29  Basuke Suzuki  <basuke.suzuki@sony.com>
+
+        [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  <youenn@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -2512 +2512 @@
     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) {