Skip to content

Commit b41b1a3

Browse files
authored
[macOS] Add TCL/TK to macOS 15 images (#13092)
1 parent 9da76c7 commit b41b1a3

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

images/macos/scripts/build/install-common-utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ for package in $common_packages; do
1717

1818
tcl-tk@8)
1919
brew_smart_install "$package"
20-
if is_VenturaX64 || is_SonomaX64; then
20+
if is_VenturaX64 || is_SonomaX64 || is_SequoiaX64; then
2121
# Fix for https://github.com/actions/runner-images/issues/11074
2222
ln -sf "$(brew --prefix tcl-tk@8)/lib/libtcl8.6.dylib" /usr/local/lib/libtcl8.6.dylib
2323
ln -sf "$(brew --prefix tcl-tk@8)/lib/libtk8.6.dylib" /usr/local/lib/libtk8.6.dylib

images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,8 @@ $android.AddTable($androidTable)
174174
$androidEnv = $android.AddHeader("Environment variables")
175175
$androidEnv.AddTable($(Build-AndroidEnvironmentTable))
176176

177-
if ($os.IsSonoma -or $os.IsVentura -or (-not $os.IsArm64)) {
177+
if ($os.IsSonoma -or $os.IsVentura -or $os.IsSequoia) {
178178
$miscellaneous = $installedSoftware.AddHeader("Miscellaneous")
179-
}
180-
181-
if ($os.IsSonoma -or $os.IsVentura) {
182179
$miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion))
183180
}
184181

images/macos/toolsets/toolset-15.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@
181181
"perl",
182182
"pkgconf",
183183
"swiftformat",
184+
"tcl-tk@8",
184185
"zstd",
185186
"ninja",
186187
"gmp",

0 commit comments

Comments
 (0)