From 600957a65ae754dfc87d1569556dd22c230597a5 Mon Sep 17 00:00:00 2001 From: midipix Date: Fri, 22 Jun 2018 12:07:50 -0400 Subject: link mode: properly handle the combination of -release and -version-info. --- src/logic/slbt_exec_ctx.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'src/logic/slbt_exec_ctx.c') diff --git a/src/logic/slbt_exec_ctx.c b/src/logic/slbt_exec_ctx.c index 9ff962c..213a9fa 100644 --- a/src/logic/slbt_exec_ctx.c +++ b/src/logic/slbt_exec_ctx.c @@ -413,6 +413,28 @@ int slbt_get_exec_ctx( /* relfilename */ if (dctx->cctx->release) { ictx->ctx.relfilename = ch; + ch += dctx->cctx->verinfo.verinfo + ? sprintf(ch,"%s%s%s-%s%s.%d.%d.%d", + ictx->ctx.ldirname, + dsoprefix, + dctx->cctx->libname, + dctx->cctx->release, + dctx->cctx->settings.dsosuffix, + dctx->cctx->verinfo.major, + dctx->cctx->verinfo.minor, + dctx->cctx->verinfo.revision) + : sprintf(ch,"%s%s%s-%s%s", + ictx->ctx.ldirname, + dsoprefix, + dctx->cctx->libname, + dctx->cctx->release, + dctx->cctx->settings.dsosuffix); + ch++; + } + + /* dsorellnkname */ + if (dctx->cctx->release) { + ictx->ctx.dsorellnkname = ch; ch += sprintf(ch,"%s%s%s-%s%s", ictx->ctx.ldirname, dsoprefix, -- cgit v1.2.3