From 1f87fd5f1cddc5ad065a3f85b5fd5d09d709dca1 Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 24 Apr 2016 05:42:37 -0400 Subject: link mode: include utility nickname in the generated wrapper. --- src/logic/slbt_exec_link.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c index 18d5ffd..72e9880 100644 --- a/src/logic/slbt_exec_link.c +++ b/src/logic/slbt_exec_link.c @@ -750,7 +750,8 @@ static int slbt_exec_link_create_executable( if (fprintf(ectx->fwrapper, "#!/bin/sh\n" "# libtool compatible executable wrapper\n" - "# Generated by slibtool (pre-alpha)\n\n" + "# Generated by %s (slibtool pre-alpha)\n\n" + "if [ -z \"$%s\" ]; then\n" "\tDL_PATH=\n" "\tCOLON=\n" @@ -760,6 +761,8 @@ static int slbt_exec_link_create_executable( "\tCOLON=\n" "\tLCOLON=':'\n" "fi\n\n", + + dctx->program, dctx->cctx->settings.ldpathenv) < 0) return -1; @@ -1073,7 +1076,7 @@ int slbt_exec_link( ret = fprintf(fout, "# libtool compatible library wrapper\n" - "# Generated by slibtool (pre-alpha)\n\n" + "# Generated by %s (slibtool pre-alpha)\n\n" "dlname='%s'\n" "library_names='%s %s %s'\n" @@ -1095,6 +1098,9 @@ int slbt_exec_link( "libdir='%s'\n", + /* nickname */ + dctx->program, + /* dlname */ fnover ? solnk : soxyz, -- cgit v1.2.3