diff options
| author | midipix <writeonce@midipix.org> | 2016-09-11 22:25:20 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-09-11 22:25:20 -0400 |
| commit | 46715b89cb68c88dad3b9e75c0c50c23a6b7f5d0 (patch) | |
| tree | db0cd5f5a783b69e5ee0f1c2c5e9eee82a2be3eb | |
| parent | 7f7c4f95802cd8d430bb305f01e04560a55c5471 (diff) | |
| download | slibtool-46715b89cb68c88dad3b9e75c0c50c23a6b7f5d0.tar.bz2 slibtool-46715b89cb68c88dad3b9e75c0c50c23a6b7f5d0.tar.xz | |
link mode: properly handle dependency information in current-dir .la wrappers.
| -rw-r--r-- | src/logic/slbt_exec_link.c | 7 |
1 files changed, 6 insertions, 1 deletions
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 { |