From 7d31e055c4e87fbb38c75105ced5bde60436c803 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 16 Apr 2022 17:08:14 +0200 Subject: [PATCH] Don't touch non-wx libraries in "make install" under Mac Only run install_name_tool on our own libraries as part of "make install" instead of doing it on all libraries in the installation directory: this was at best useless and at worst harmful, as some combinations of install_name_tool and macOS versions don't work well together and result in corrupting the already installed libraries. --- configure | 2 +- configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 82162e94b2..93364deaf3 100755 --- a/configure +++ b/configure @@ -33864,7 +33864,7 @@ rm -f core conftest.err conftest.$ac_objext \ DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" cat <change-install-names #!/bin/sh -libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` +libnames=\`cd lib ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` changes='' for dep in \${libnames} ; do changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}" diff --git a/configure.in b/configure.in index 1af9b74405..353d1f5627 100644 --- a/configure.in +++ b/configure.in @@ -4027,7 +4027,7 @@ if test "$wxUSE_SHARED" = "yes"; then DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" cat <change-install-names #!/bin/sh -libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\` +libnames=\`cd lib ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\` changes='' for dep in \${libnames} ; do changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}"