diff options
| author | midipix <writeonce@midipix.org> | 2024-03-03 20:01:43 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2024-03-03 22:10:17 +0000 |
| commit | a3e2d3ae686409f59f7470ae1898f96e1c9df453 (patch) | |
| tree | 440965e6e25d4ced2a4b8a65aa234a5f01fa31e4 /src/logic | |
| parent | 99fb66b6e91e251dbb2ceb7d186d501110fd999f (diff) | |
| download | slibtool-a3e2d3ae686409f59f7470ae1898f96e1c9df453.tar.bz2 slibtool-a3e2d3ae686409f59f7470ae1898f96e1c9df453.tar.xz | |
slbt_exec_link_create_executable(): fix .la based input argument selection.
Diffstat (limited to 'src/logic')
| -rw-r--r-- | src/logic/linkcmd/slbt_linkcmd_argv.c | 2 | ||||
| -rw-r--r-- | src/logic/linkcmd/slbt_linkcmd_executable.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/logic/linkcmd/slbt_linkcmd_argv.c b/src/logic/linkcmd/slbt_linkcmd_argv.c index 5e2d606..de145e0 100644 --- a/src/logic/linkcmd/slbt_linkcmd_argv.c +++ b/src/logic/linkcmd/slbt_linkcmd_argv.c @@ -257,8 +257,6 @@ slbt_hidden int slbt_adjust_linker_argument( if (slbt_symlink_is_a_placeholder(fdcwd,arg)) sprintf(dot,"%s",arsuffix); - else if (dctx->cctx->drvflags & SLBT_DRIVER_STATIC) - sprintf(dot,"%s",arsuffix); else if ((fdlib = openat(fdcwd,arg,O_RDONLY)) >= 0) close(fdlib); else diff --git a/src/logic/linkcmd/slbt_linkcmd_executable.c b/src/logic/linkcmd/slbt_linkcmd_executable.c index bb23701..76c0b1d 100644 --- a/src/logic/linkcmd/slbt_linkcmd_executable.c +++ b/src/logic/linkcmd/slbt_linkcmd_executable.c @@ -100,7 +100,7 @@ slbt_hidden int slbt_exec_link_create_executable( fdcwd = slbt_driver_fdcwd(dctx); /* fpic */ - fpic = !(dctx->cctx->drvflags & SLBT_DRIVER_ALL_STATIC); + fpic = (dctx->cctx->drvflags & SLBT_DRIVER_SHARED); /* input argument adjustment */ for (parg=ectx->cargv; *parg; parg++) @@ -110,7 +110,7 @@ slbt_hidden int slbt_exec_link_create_executable( for (parg=ectx->cargv, xarg=ectx->xargv; *parg; parg++, xarg++) if (slbt_adjust_linker_argument( dctx, - *parg,xarg,true, + *parg,xarg,fpic, dctx->cctx->settings.dsosuffix, dctx->cctx->settings.arsuffix, &depsmeta) < 0) |