Title: [260339] trunk/Tools
Revision
260339
Author
[email protected]
Date
2020-04-19 10:56:18 -0700 (Sun, 19 Apr 2020)

Log Message

Allow to override sccache server port.
https://bugs.webkit.org/show_bug.cgi?id=210722

Reviewed by Philippe Normand.

This is useful so that sccache can work both inside and outside the sandbox,
without getting confused about flatpak's chroot.

* flatpak/flatpakutils.py:
(WebkitFlatpak.run_in_sandbox):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (260338 => 260339)


--- trunk/Tools/ChangeLog	2020-04-19 17:51:19 UTC (rev 260338)
+++ trunk/Tools/ChangeLog	2020-04-19 17:56:18 UTC (rev 260339)
@@ -1,3 +1,16 @@
+2020-04-19  Emilio Cobos Álvarez  <[email protected]>
+
+        Allow to override sccache server port.
+        https://bugs.webkit.org/show_bug.cgi?id=210722
+
+        Reviewed by Philippe Normand.
+
+        This is useful so that sccache can work both inside and outside the sandbox,
+        without getting confused about flatpak's chroot.
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak.run_in_sandbox):
+
 2020-04-19  Darin Adler  <[email protected]>
 
         REGRESSION (r260334): SpacebarScrolling.cpp (test in TestWebKitAPI) fails to compile because it includes an Objective-C header

Modified: trunk/Tools/flatpak/flatpakutils.py (260338 => 260339)


--- trunk/Tools/flatpak/flatpakutils.py	2020-04-19 17:51:19 UTC (rev 260338)
+++ trunk/Tools/flatpak/flatpakutils.py	2020-04-19 17:56:18 UTC (rev 260339)
@@ -704,6 +704,11 @@
             _log.debug("Enabling network access for the remote sccache")
             flatpak_command.append(share_network_option)
 
+        override_sccache_server_port = os.environ.get("WEBKIT_SCCACHE_SERVER_PORT")
+        if override_sccache_server_port:
+            _log.debug("Overriding sccache server port to %s" % override_sccache_server_port)
+            forwarded["SCCACHE_SERVER_PORT"] = override_sccache_server_port
+
         if self.use_icecream and not self.regenerate_toolchains:
             _log.debug('Enabling the icecream compiler')
             if share_network_option not in flatpak_command:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to