diff options
| author | midipix <writeonce@midipix.org> | 2024-02-14 01:46:59 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2024-02-14 01:57:27 +0000 |
| commit | b4058c47a4dbd27e8012d13697aaf30c447effbd (patch) | |
| tree | c6956fc05c9f4b1024d50c59b91e48501b134a2c /src/driver/slbt_driver_ctx.c | |
| parent | 6bc1706e77c607947ac30f96ec0bce3e056b3026 (diff) | |
| download | slibtool-b4058c47a4dbd27e8012d13697aaf30c447effbd.tar.bz2 slibtool-b4058c47a4dbd27e8012d13697aaf30c447effbd.tar.xz | |
driver: rlibtool mode: also derive AS from the located libtool script.
Diffstat (limited to 'src/driver/slbt_driver_ctx.c')
| -rw-r--r-- | src/driver/slbt_driver_ctx.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/driver/slbt_driver_ctx.c b/src/driver/slbt_driver_ctx.c index deb8cdc..15c2cf5 100644 --- a/src/driver/slbt_driver_ctx.c +++ b/src/driver/slbt_driver_ctx.c @@ -339,6 +339,7 @@ int slbt_get_driver_ctx( const char * lconf; uint64_t lflags; const char * cfgmeta_ar; + const char * cfgmeta_as; const char * cfgmeta_ranlib; const char * cfgmeta_dlltool; @@ -395,6 +396,7 @@ int slbt_get_driver_ctx( cmdnoshared = 0; cfgmeta_ar = 0; + cfgmeta_as = 0; cfgmeta_ranlib = 0; cfgmeta_dlltool = 0; @@ -595,6 +597,7 @@ int slbt_get_driver_ctx( case TAG_AS: cctx.host.as = entry->arg; + cfgmeta_as = cfgexplicit; break; case TAG_RANLIB: @@ -816,6 +819,9 @@ int slbt_get_driver_ctx( if (ctx->cctx.host.ar && !cfgmeta_ar) cfgmeta_ar = cfglconf; + if (ctx->cctx.host.as && !cfgmeta_as) + cfgmeta_as = cfglconf; + if (ctx->cctx.host.ranlib && !cfgmeta_ranlib) cfgmeta_ranlib = cfglconf; @@ -862,6 +868,7 @@ int slbt_get_driver_ctx( &ctx->cctx.host, &ctx->cctx.cfgmeta, cfgmeta_ar, + cfgmeta_as, cfgmeta_ranlib, cfgmeta_dlltool)) return slbt_get_driver_ctx_fail(&ctx->ctx,0); |