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 |
--- configure.py.orig 2020-11-14 16:39:43 UTC |
8 |
+++ configure.py |
9 |
@@ -2118,9 +2118,9 @@ def create_template_vars(source_paths, build_paths, op |
10 |
|
11 |
'visibility_attribute': cc.gen_visibility_attribute(options), |
12 |
|
13 |
- 'lib_link_cmd': cc.so_link_command_for(osinfo.basename, options) + ' ' + external_link_cmd(), |
14 |
- 'exe_link_cmd': cc.binary_link_command_for(osinfo.basename, options) + ' ' + external_link_cmd(), |
15 |
- 'post_link_cmd': '', |
16 |
+ 'lib_link_cmd': cc.so_link_command_for(osinfo.basename, options), |
17 |
+ 'exe_link_cmd': cc.binary_link_command_for(osinfo.basename, options), |
18 |
+ 'external_link_cmd': external_link_cmd(), |
19 |
|
20 |
'ar_command': ar_command(), |
21 |
'ar_options': options.ar_options or cc.ar_options or osinfo.ar_options, |
22 |
configure.py | 6 +++--- |
23 |
src/build-data/makefile.in | 2 +- |
24 |
2 files changed, 4 insertions(+), 4 deletions(-) |
25 |
|
26 |
--- src/build-data/makefile.in.orig 2020-11-07 07:43:35 UTC |
27 |
+++ src/build-data/makefile.in |
28 |
@@ -20,7 +20,7 @@ LDFLAGS = %{ldflags} |
29 |
|
30 |
EXE_LINK_CMD = %{exe_link_cmd} |
31 |
|
32 |
-LIB_LINKS_TO = %{link_to} |
33 |
+LIB_LINKS_TO = %{external_link_cmd} %{link_to} |
34 |
EXE_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO) |
35 |
|
36 |
BUILD_FLAGS = $(ABI_FLAGS) $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS) |