Title: [283034] trunk/Tools
- Revision
- 283034
- Author
- [email protected]
- Date
- 2021-09-24 03:07:45 -0700 (Fri, 24 Sep 2021)
Log Message
REGRESSION(r282742): Broke IceCC builds
https://bugs.webkit.org/show_bug.cgi?id=230547
Patch by Philippe Normand <[email protected]> on 2021-09-24
Reviewed by Sergio Villar Senin.
There's no need to check the default IceCC toolchain exists, we can't do that from the host
anyway because their path is a sandbox path. Additionally we now check host paths supplied
through $ICECC_VERSION_OVERRIDE and ICECC_VERSION_APPEND.
* flatpak/flatpakutils.py:
(WebkitFlatpak.run_in_sandbox):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (283033 => 283034)
--- trunk/Tools/ChangeLog 2021-09-24 09:39:18 UTC (rev 283033)
+++ trunk/Tools/ChangeLog 2021-09-24 10:07:45 UTC (rev 283034)
@@ -1,3 +1,17 @@
+2021-09-24 Philippe Normand <[email protected]>
+
+ REGRESSION(r282742): Broke IceCC builds
+ https://bugs.webkit.org/show_bug.cgi?id=230547
+
+ Reviewed by Sergio Villar Senin.
+
+ There's no need to check the default IceCC toolchain exists, we can't do that from the host
+ anyway because their path is a sandbox path. Additionally we now check host paths supplied
+ through $ICECC_VERSION_OVERRIDE and ICECC_VERSION_APPEND.
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.run_in_sandbox):
+
2021-09-24 Youenn Fablet <[email protected]>
[IOS 15] Video track does not get unmuted in case of tab was inactive less than ~500 ms
Modified: trunk/Tools/flatpak/flatpakutils.py (283033 => 283034)
--- trunk/Tools/flatpak/flatpakutils.py 2021-09-24 09:39:18 UTC (rev 283033)
+++ trunk/Tools/flatpak/flatpakutils.py 2021-09-24 10:07:45 UTC (rev 283034)
@@ -888,20 +888,31 @@
n_cores = multiprocessing.cpu_count() * 3
_log.debug('Following icecream recommendation for the number of cores to use: %d' % n_cores)
toolchain_name = os.environ.get("CC", "gcc")
+ default_toolchain = self.icc_version.get(toolchain_name)
+
try:
- toolchain_path = os.environ.get("ICECC_VERSION_OVERRIDE", self.icc_version[toolchain_name])
+ toolchain_override = os.environ["ICECC_VERSION_OVERRIDE"]
except KeyError:
- Console.error_message("Toolchains configuration not found. Please run webkit-flatpak -r")
+ toolchain_path = default_toolchain
+ else:
+ if not os.path.isfile(toolchain_override):
+ Console.error_message("%s toolchain not found. ICECC_VERSION_OVERRIDE mis-configured?", toolchain_override)
+ return 1
+
+ toolchain_path = self.host_path_to_sandbox_path(toolchain_override)
+
+ if not toolchain_path:
+ Console.error_message("Toolchains configuration not found. Please run webkit-flatpak -r or set ICECC_VERSION_OVERRIDE to a valid host path")
return 1
- else:
- toolchain_path = self.host_path_to_sandbox_path(toolchain_path)
+
if "ICECC_VERSION_APPEND" in os.environ:
+ extra_toolchain = os.environ["ICECC_VERSION_APPEND"]
+ if not os.path.isfile(extra_toolchain):
+ Console.error_message("%s is not a valid IceCC toolchain. ICECC_VERSION_APPEND mis-configured?", extra_toolchain)
+ return 1
toolchain_path += ","
- toolchain_path += self.host_path_to_sandbox_path(os.environ["ICECC_VERSION_APPEND"])
- native_toolchain = toolchain_path.split(",")[0]
- if not os.path.isfile(native_toolchain):
- Console.error_message("%s is not a valid IceCC toolchain. Please run webkit-flatpak -r", native_toolchain)
- return 1
+ toolchain_path += self.host_path_to_sandbox_path(extra_toolchain)
+
sandbox_environment.update({
"CCACHE_PREFIX": "icecc",
"ICECC_TEST_SOCKET": "/run/icecc/iceccd.socket",
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
