Fix use of -L flag when combined with --external-libdir

GH #2496

2 files changed, 4 insertions, 4 deletions

diff --git a/configure.py b/configure.py
index 88eeaa575..0808a0358 100755
--- a/configure.py
+++ b/configure.py
@@ -2137,9 +2137,9 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch,
 
         'visibility_attribute': cc.gen_visibility_attribute(options),
 
-        'lib_link_cmd': cc.so_link_command_for(osinfo.basename, options) + ' ' + external_link_cmd(),
-        'exe_link_cmd': cc.binary_link_command_for(osinfo.basename, options) + ' ' + external_link_cmd(),
-        'post_link_cmd': '',
+        'lib_link_cmd': cc.so_link_command_for(osinfo.basename, options),
+        'exe_link_cmd': cc.binary_link_command_for(osinfo.basename, options),
+        'external_link_cmd': external_link_cmd(),
 
         'ar_command': ar_command(),
         'ar_options': options.ar_options or cc.ar_options or osinfo.ar_options,
diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
index 4d68ab1ec..7a15979b6 100644
--- a/src/build-data/makefile.in
+++ b/src/build-data/makefile.in
@@ -20,7 +20,7 @@ LDFLAGS        = %{ldflags}
 
 EXE_LINK_CMD   = %{exe_link_cmd}
 
-LIB_LINKS_TO   = %{link_to}
+LIB_LINKS_TO   = %{external_link_cmd} %{link_to}
 EXE_LINKS_TO   = %{link_to_botan} $(LIB_LINKS_TO)
 
 BUILD_FLAGS    = $(ABI_FLAGS) $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)