From 46715b89cb68c88dad3b9e75c0c50c23a6b7f5d0 Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 11 Sep 2016 22:25:20 -0400 Subject: link mode: properly handle dependency information in current-dir .la wrappers. --- src/logic/slbt_exec_link.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c index 4be8430..8c5009f 100644 --- a/src/logic/slbt_exec_link.c +++ b/src/logic/slbt_exec_link.c @@ -425,9 +425,14 @@ static int slbt_exec_link_adjust_argument_vector( : 0; if ((base = strrchr(lib,'/'))) { - if (base - lib >= 6) + if (base - lib == 5) { + if (!(strncmp(&base[-5],".libs/",6))) + base -= 4; + + } else if (base - lib >= 6) { if (!(strncmp(&base[-6],"/.libs/",7))) base -= 6; + } *base = 0; } else { -- cgit v1.2.3