|
Line 0
Link Here
|
|
|
1 |
From 639a5c4515a36bcbadb82145d755005620c535c3 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Jack Lloyd <jack@randombit.net> |
| 3 |
Date: Fri, 13 Nov 2020 18:04:09 -0500 |
| 4 |
Subject: [PATCH] Fix use of -L flag when combined with --external-libdir |
| 5 |
|
| 6 |
GH #2496 |
| 7 |
--- |
| 8 |
configure.py | 6 +++--- |
| 9 |
src/build-data/makefile.in | 2 +- |
| 10 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 11 |
|
| 12 |
diff --git a/configure.py b/configure.py |
| 13 |
index 88eeaa5757..0808a03581 100755 |
| 14 |
--- configure.py |
| 15 |
+++ configure.py |
| 16 |
@@ -2137,9 +2137,9 @@ def choose_cxx_exe(): |
| 17 |
|
| 18 |
'visibility_attribute': cc.gen_visibility_attribute(options), |
| 19 |
|
| 20 |
- 'lib_link_cmd': cc.so_link_command_for(osinfo.basename, options) + ' ' + external_link_cmd(), |
| 21 |
- 'exe_link_cmd': cc.binary_link_command_for(osinfo.basename, options) + ' ' + external_link_cmd(), |
| 22 |
- 'post_link_cmd': '', |
| 23 |
+ 'lib_link_cmd': cc.so_link_command_for(osinfo.basename, options), |
| 24 |
+ 'exe_link_cmd': cc.binary_link_command_for(osinfo.basename, options), |
| 25 |
+ 'external_link_cmd': external_link_cmd(), |
| 26 |
|
| 27 |
'ar_command': ar_command(), |
| 28 |
'ar_options': options.ar_options or cc.ar_options or osinfo.ar_options, |
| 29 |
diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in |
| 30 |
index 4d68ab1ec7..7a15979b6e 100644 |
| 31 |
--- src/build-data/makefile.in |
| 32 |
+++ src/build-data/makefile.in |
| 33 |
@@ -20,7 +20,7 @@ LDFLAGS = %{ldflags} |
| 34 |
|
| 35 |
EXE_LINK_CMD = %{exe_link_cmd} |
| 36 |
|
| 37 |
-LIB_LINKS_TO = %{link_to} |
| 38 |
+LIB_LINKS_TO = %{external_link_cmd} %{link_to} |
| 39 |
EXE_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO) |
| 40 |
|
| 41 |
BUILD_FLAGS = $(ABI_FLAGS) $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS) |