diff options
| author | midipix <writeonce@midipix.org> | 2024-02-13 16:22:20 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2024-02-13 16:22:20 +0000 |
| commit | fc8ee9c0c22a831f03d35885e14ac72ddc91a04c (patch) | |
| tree | 0d4054263addb364ddf86309d46d5378237eca50 /src/internal | |
| parent | c1f21665c7010c70b87f79e1b81dc7f2564f26c9 (diff) | |
| download | slibtool-fc8ee9c0c22a831f03d35885e14ac72ddc91a04c.tar.bz2 slibtool-fc8ee9c0c22a831f03d35885e14ac72ddc91a04c.tar.xz | |
driver: rlibtool mode: also derive DLLTOOL from the located libtool script.
Diffstat (limited to 'src/internal')
| -rw-r--r-- | src/internal/slibtool_driver_impl.h | 3 | ||||
| -rw-r--r-- | src/internal/slibtool_lconf_impl.c | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/internal/slibtool_driver_impl.h b/src/internal/slibtool_driver_impl.h index 948d68c..2644e27 100644 --- a/src/internal/slibtool_driver_impl.h +++ b/src/internal/slibtool_driver_impl.h @@ -245,7 +245,8 @@ int slbt_init_host_params( struct slbt_host_params * host, struct slbt_host_params * cfgmeta, const char * cfgmeta_ar, - const char * cfgmeta_ranlib); + const char * cfgmeta_ranlib, + const char * cfgmeta_dlltool); void slbt_free_host_params(struct slbt_host_strs * host); diff --git a/src/internal/slibtool_lconf_impl.c b/src/internal/slibtool_lconf_impl.c index da0ffdd..c6c2f2a 100644 --- a/src/internal/slibtool_lconf_impl.c +++ b/src/internal/slibtool_lconf_impl.c @@ -806,6 +806,17 @@ int slbt_get_lconf_flags( } + /* dlltool tool (optional) */ + if (!ctx->cctx.host.dlltool) { + if (slbt_get_lconf_var(addr,cap,"DLLTOOL=",&val) >= 0) { + if (val[0] && !(ctx->host.dlltool = strdup(val))) + return SLBT_SYSTEM_ERROR(dctx,0); + + ctx->cctx.host.dlltool = ctx->host.dlltool; + } + } + + /* all done */ ctx->lconf.addr = addr; ctx->lconf.size = st.st_size; |