summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2021-04-03 22:48:18 +0000
committermidipix <writeonce@midipix.org>2021-04-03 22:48:18 +0000
commit9582b2461a173645b0bb2c9ddf7dc8d58cac2042 (patch)
treec8a06dc98f889a25e789f9f129c9064a2b3a1eab
parentd4560dfd0d5c93c82a54451b50972d1ce2907995 (diff)
downloadslibtool-9582b2461a173645b0bb2c9ddf7dc8d58cac2042.tar.bz2
slibtool-9582b2461a173645b0bb2c9ddf7dc8d58cac2042.tar.xz
driver: --tag=disable-shared now overrides a heuristics-based -disable-static.
-rw-r--r--src/driver/slbt_driver_ctx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/driver/slbt_driver_ctx.c b/src/driver/slbt_driver_ctx.c
index 7ce2c92..1d9ea5f 100644
--- a/src/driver/slbt_driver_ctx.c
+++ b/src/driver/slbt_driver_ctx.c
@@ -1712,6 +1712,9 @@ int slbt_get_driver_ctx(
if (slbt_get_lconf_flags(&ctx->ctx,lconf,&lflags) < 0)
return slbt_get_driver_ctx_fail(&ctx->ctx,0);
+ if (cmdnoshared)
+ lflags &= ~(uint64_t)SLBT_DRIVER_DISABLE_STATIC;
+
cctx.drvflags |= lflags;
cctx.drvflags |= SLBT_DRIVER_SHARED;
cctx.drvflags |= SLBT_DRIVER_STATIC;