solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix wxrc installation under macOS

Browse source 
Run install_name_tool on wxrc binary again: this used to be done and is
still needed, but was broken in 30915c6163 (Make wxrc independent from
GUI support, 2021-07-07) which moved the code appending the line calling
install_name_tool for wxrc to change-install-name script before this
script creation, meaning that it was simply overwritten later.

See #22620.
This commit is contained in:
Mark Harfouche 2022-07-10 08:37:02 -04:00 • committed by Vadim Zeitlin
parent c88d18278b
commit a157327207
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
configure.in
View file

@ -2975,7 +2975,6 @@ if test "$wxUSE_XML" != "yes"; then
USE_XML=0
else
USE_XML=1
echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" >> change-install-names
fi
@ -4046,6 +4045,10 @@ done
for i in \${libnames} ; do
${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i}
done
if test -f "\${2}/wxrc-${WX_RELEASE}" ; then
${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}
fi
EOF
chmod +x change-install-names
DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"