From b41b1a3ee95ba408f36d3da14367817ba4fc728c Mon Sep 17 00:00:00 2001
From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com>
Date: Fri, 26 Sep 2025 15:29:04 +0200
Subject: [PATCH] [macOS] Add TCL/TK to macOS 15 images (#13092)

---
 images/macos/scripts/build/install-common-utils.sh        | 2 +-
 images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 | 5 +----
 images/macos/toolsets/toolset-15.json                     | 1 +
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh
index 269ff8938..4514d276b 100644
--- a/images/macos/scripts/build/install-common-utils.sh
+++ b/images/macos/scripts/build/install-common-utils.sh
@@ -17,7 +17,7 @@ for package in $common_packages; do
 
         tcl-tk@8)
             brew_smart_install "$package"
-            if is_VenturaX64 || is_SonomaX64; then
+            if is_VenturaX64 || is_SonomaX64 || is_SequoiaX64; then
                 # Fix for https://github.com/actions/runner-images/issues/11074
                 ln -sf "$(brew --prefix tcl-tk@8)/lib/libtcl8.6.dylib" /usr/local/lib/libtcl8.6.dylib
                 ln -sf "$(brew --prefix tcl-tk@8)/lib/libtk8.6.dylib" /usr/local/lib/libtk8.6.dylib
diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
index 9cab34a63..0739384c0 100644
--- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
+++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
@@ -174,11 +174,8 @@ $android.AddTable($androidTable)
 $androidEnv = $android.AddHeader("Environment variables")
 $androidEnv.AddTable($(Build-AndroidEnvironmentTable))
 
-if ($os.IsSonoma -or $os.IsVentura -or (-not $os.IsArm64)) {
+if ($os.IsSonoma -or $os.IsVentura -or $os.IsSequoia) {
     $miscellaneous = $installedSoftware.AddHeader("Miscellaneous")
-}
-
-if ($os.IsSonoma -or $os.IsVentura) {
     $miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion))
 }
 
diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json
index af19f3c57..f15fdd7f1 100644
--- a/images/macos/toolsets/toolset-15.json
+++ b/images/macos/toolsets/toolset-15.json
@@ -181,6 +181,7 @@
             "perl",
             "pkgconf",
             "swiftformat",
+            "tcl-tk@8",
             "zstd",
             "ninja",
             "gmp",