Skip to content

Commit 7fdc132

Browse files
speleo3vadz
authored andcommitted
Fix dylib symlinks on Apple Silicon Macs
See wxWidgets#23143, wxWidgets#24524. (cherry picked from commit fa2fb36)
1 parent ad7eb3a commit 7fdc132

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

configure

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33993,6 +33993,10 @@ for dep in \${libnames} ; do
3399333993
changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}"
3399433994
done
3399533995
for i in \${libnames} ; do
33996+
if test -L \${1}/\${i}; then
33997+
# skip symbolic links
33998+
continue
33999+
fi
3399634000
${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i}
3399734001
done
3399834002

configure.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4067,6 +4067,10 @@ for dep in \${libnames} ; do
40674067
changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}"
40684068
done
40694069
for i in \${libnames} ; do
4070+
if test -L \${1}/\${i}; then
4071+
# skip symbolic links
4072+
continue
4073+
fi
40704074
${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i}
40714075
done
40724076

docs/changes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ wxOSX:
323323
- Fix handling of nested modal dialogs (WakA, #24418).
324324
- Fix translations when using zh-Hans-CN locale (#24396).
325325
- Add filters support to wxFileDialog::ShowWindowModal() (Gammasoft, #24438).
326+
- Fix installation on some Apple Silicon Macs (Thomas Holder, #23143, #24524).
326327

327328
wxQt:
328329

0 commit comments

Comments
 (0)