diff options
Diffstat (limited to 'src/logic')
| -rw-r--r-- | src/logic/linkcmd/slbt_linkcmd_argv.c | 16 | ||||
| -rw-r--r-- | src/logic/slbt_exec_ctx.c | 8 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/logic/linkcmd/slbt_linkcmd_argv.c b/src/logic/linkcmd/slbt_linkcmd_argv.c index 013317f..546c8d5 100644 --- a/src/logic/linkcmd/slbt_linkcmd_argv.c +++ b/src/logic/linkcmd/slbt_linkcmd_argv.c @@ -1027,6 +1027,22 @@ slbt_hidden int slbt_exec_link_finalize_argument_vector( } } + /* replace -lltdl with -lsltdl as needed */ + if (dctx->cctx->drvflags & SLBT_DRIVER_PREFER_SLTDL) { + struct slbt_exec_ctx_impl * ictx; + + ictx = slbt_get_exec_ictx(ectx); + + for (src=ectx->argv; *src; src++) + if ((src[0][0] == '-') && (src[0][1] == 'l')) + if ((src[0][2] == 'l') + && (src[0][3] == 't') + && (src[0][4] == 'd') + && (src[0][5] == 'l')) + if (!src[0][6]) + *src = ictx->lsltdl; + } + /* properly null-terminate argv, accounting for redundant -l arguments */ *dst = 0; diff --git a/src/logic/slbt_exec_ctx.c b/src/logic/slbt_exec_ctx.c index 223be17..f76990a 100644 --- a/src/logic/slbt_exec_ctx.c +++ b/src/logic/slbt_exec_ctx.c @@ -131,6 +131,9 @@ static struct slbt_exec_ctx_impl * slbt_exec_ctx_alloc( size += exts * SLBT_ECTX_LIB_EXTRAS; } + /* -lsltdl (--prefer-sltdl impl.) */ + size += 8; + /* string buffers: args, shadow */ if (!(args = malloc(size))) return 0; @@ -629,6 +632,11 @@ int slbt_ectx_get_exec_ctx( } + /* -lsltdl (--prefer-sltdl impl.) */ + ictx->lsltdl = ch; + strcpy(ch,"-lsltdl"); + ch += 8; + /* dlopen, dlpreopen */ if ((dlopenv = idctx->dlopenv), (dlactxv = ictx->dlactxv)) { if (slbt_ar_get_varchive_ctx(dctx,dlactxv) < 0) |