diff options
| author | midipix <writeonce@midipix.org> | 2017-02-08 18:31:59 -0500 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2017-02-08 18:31:59 -0500 |
| commit | 0330cf187ed6baf45f019f2c3a3d5e5815e8e70b (patch) | |
| tree | e964e5e0d0f64aae647863b6889a03e25d8fefbd /src/logic | |
| parent | 78d96ab2709524dc5b6e8976eed90e75ebb4ecf0 (diff) | |
| download | slibtool-0330cf187ed6baf45f019f2c3a3d5e5815e8e70b.tar.bz2 slibtool-0330cf187ed6baf45f019f2c3a3d5e5815e8e70b.tar.xz | |
link mode: static archives: always have ar(1) act as ranlib(1).
Diffstat (limited to 'src/logic')
| -rw-r--r-- | src/logic/slbt_exec_link.c | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c index 84cea6f..0d225c4 100644 --- a/src/logic/slbt_exec_link.c +++ b/src/logic/slbt_exec_link.c @@ -33,8 +33,7 @@ struct slbt_deps_meta { /* ---------- --------------------- ----- ------ */ /* libfoo.a [-shared|-static] bar.lo libfoo.a */ /* */ -/* ar cru libfoo.a bar.o */ -/* ranlib libfoo.a */ +/* ar crs libfoo.a bar.o */ /* */ /*******************************************************************/ @@ -46,8 +45,7 @@ struct slbt_deps_meta { /* .libs/libfoo.a */ /* .libs/libfoo.la (lnk) */ /* */ -/* ar cru .libs/libfoo.a .libs/bar.o */ -/* ranlib .libs/libfoo.a */ +/* ar crs .libs/libfoo.a .libs/bar.o */ /* (generate libfoo.la) */ /* ln -s ../libfoo.la .libs/libfoo.la */ /* */ @@ -61,8 +59,7 @@ struct slbt_deps_meta { /* .libs/libfoo.a */ /* .libs/libfoo.la (lnk) */ /* */ -/* ar cru .libs/libfoo.a bar.o */ -/* ranlib .libs/libfoo.a */ +/* ar crs .libs/libfoo.a bar.o */ /* (generate libfoo.la) */ /* ln -s ../libfoo.la .libs/libfoo.la */ /* */ @@ -823,7 +820,6 @@ static int slbt_exec_link_create_archive( char * base; char * mark; char * slash; - char * ranlib[3]; char program[PATH_MAX]; char output [PATH_MAX]; char arfile [PATH_MAX]; @@ -856,7 +852,7 @@ static int slbt_exec_link_create_archive( aarg = ectx->altv; *aarg++ = program; - *aarg++ = "cru"; + *aarg++ = "crs"; *aarg++ = output; /* input argument adjustment */ @@ -892,25 +888,6 @@ static int slbt_exec_link_create_archive( if (slbt_archive_import(dctx,ectx,output,*parg)) return SLBT_NESTED_ERROR(dctx); - /* ranlib argv */ - if ((size_t)snprintf(program,sizeof(program),"%s", - dctx->cctx->host.ranlib) >= sizeof(program)) - return SLBT_BUFFER_ERROR(dctx); - - ranlib[0] = program; - ranlib[1] = output; - ranlib[2] = 0; - ectx->argv = ranlib; - - /* step output */ - if (!(dctx->cctx->drvflags & SLBT_DRIVER_SILENT)) - if (slbt_output_link(dctx,ectx)) - return SLBT_NESTED_ERROR(dctx); - - /* ranlib spawn */ - if ((slbt_spawn(ectx,true) < 0) || ectx->exitcode) - return SLBT_SPAWN_ERROR(dctx); - if (fprimary && (dctx->cctx->drvflags & SLBT_DRIVER_DISABLE_SHARED)) { strcpy(arlink,output); mark = strrchr(arlink,'/'); |