diff options
| author | midipix <writeonce@midipix.org> | 2016-09-12 15:03:02 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-09-12 15:17:15 -0400 |
| commit | 36056550f9a3d0dbca15bc9a200acaca1d68b43a (patch) | |
| tree | d21c7ae6381a74cf62beff4ab24dc739ed3e062b /src | |
| parent | e35cc3e9ba54a4db85d1bd05088c74b21970e16c (diff) | |
| download | slibtool-36056550f9a3d0dbca15bc9a200acaca1d68b43a.tar.bz2 slibtool-36056550f9a3d0dbca15bc9a200acaca1d68b43a.tar.xz | |
link mode: properly handle sub-directories in indirect .la wrapper dependency.
Diffstat (limited to 'src')
| -rw-r--r-- | src/logic/slbt_exec_link.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c index 84b520d..cde7136 100644 --- a/src/logic/slbt_exec_link.c +++ b/src/logic/slbt_exec_link.c @@ -141,7 +141,7 @@ static int slbt_get_deps_meta( for (; deplib; ) { if ((deplib[0] == '-') && (deplib[1] == 'L')) - if (deplib[2] == '.') + if (deplib[2] != '/') depsmeta->infolen += libexlen; depsmeta->depscnt++; @@ -453,7 +453,7 @@ static int slbt_exec_link_adjust_argument_vector( /* handle -L... as needed */ if ((mark[0] == '-') && (mark[1] == 'L') - && (mark[2] == '.')) { + && (mark[2] != '/')) { if (strlen(mark) >= sizeof(depdir) - 1) return SLBT_BUFFER_ERROR(dctx); @@ -626,7 +626,7 @@ static int slbt_exec_link_create_dep_file( for (; deplib; ) { if ((deplib[0] == '-') && (deplib[1] == 'L') - && (deplib[2] == '.')) { + && (deplib[2] != '/')) { if (fprintf(ectx->fdeps,"-L%s/%s", reladir,&deplib[2]) < 0) { fclose(fdeps); |