Remove support for running macOS binaries from local dir

This is a lot of complications just to work around a user
misaprehension about ld paths. And likely most macOS users are getting
it via Homebrew anyway.

Taken from #1505

2 files changed, 1 insertions, 15 deletions

diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py
index 0c9e7dd1f..234cc7e22 100755
--- a/src/scripts/ci_build.py
+++ b/src/scripts/ci_build.py
@@ -301,6 +301,7 @@ def run_cmd(cmd, root_dir):
     cmd = [os.path.expandvars(elem) for elem in cmd]
     sub_env = os.environ.copy()
     sub_env['LD_LIBRARY_PATH'] = os.path.abspath(root_dir)
+    sub_env['DYLD_LIBRARY_PATH'] = os.path.abspath(root_dir)
     sub_env['PYTHONPATH'] = os.path.abspath(os.path.join(root_dir, 'src/python'))
     cwd = None
 
diff --git a/src/scripts/install.py b/src/scripts/install.py
index ed6fe897f..32a7a7e9e 100755
--- a/src/scripts/install.py
+++ b/src/scripts/install.py
@@ -15,7 +15,6 @@ import optparse # pylint: disable=deprecated-module
 import os
 import shutil
 import sys
-import subprocess
 import traceback
 
 def parse_command_line(args):
@@ -212,20 +211,6 @@ def main(args):
     if build_cli:
         copy_executable(cfg['cli_exe'], prepend_destdir(os.path.join(bin_dir, cfg['cli_exe_name'])))
 
-    # On MacOS, if we are using shared libraries and we install, we should fix
-    # up the library name, otherwise the botan command won't work; ironically
-    # we only need to do this because we previously changed it from a setting
-    # that would be correct for installation to one that lets us run it from
-    # the build directory
-    if target_os == 'macos' and build_shared_lib and build_cli:
-        soname_abi = cfg['soname_abi']
-
-        subprocess.check_call(['install_name_tool',
-                               '-change',
-                               os.path.join('@executable_path', soname_abi),
-                               os.path.join(lib_dir, soname_abi),
-                               os.path.join(bin_dir, cfg['cli_exe_name'])])
-
     if 'botan_pkgconfig' in cfg:
         pkgconfig_dir = os.path.join(options.prefix, options.libdir, options.pkgconfigdir)
         makedirs(prepend_destdir(pkgconfig_dir))