summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2021-04-03 23:02:30 +0000
committermidipix <writeonce@midipix.org>2021-04-03 23:02:30 +0000
commitc9788a274260102616259a88e8930f6da2ab6514 (patch)
tree3f10a24d3ba01cfcd6d01490f3e60cddfed44d97
parent9582b2461a173645b0bb2c9ddf7dc8d58cac2042 (diff)
downloadslibtool-c9788a274260102616259a88e8930f6da2ab6514.tar.bz2
slibtool-c9788a274260102616259a88e8930f6da2ab6514.tar.xz
driver: a heuristics-based -disable-shared now overrides --tag=disable-static.
-rw-r--r--src/driver/slbt_driver_ctx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/driver/slbt_driver_ctx.c b/src/driver/slbt_driver_ctx.c
index 1d9ea5f..be70ad5 100644
--- a/src/driver/slbt_driver_ctx.c
+++ b/src/driver/slbt_driver_ctx.c
@@ -1715,6 +1715,10 @@ int slbt_get_driver_ctx(
if (cmdnoshared)
lflags &= ~(uint64_t)SLBT_DRIVER_DISABLE_STATIC;
+ if (cmdnostatic)
+ if (lflags & SLBT_DRIVER_DISABLE_SHARED)
+ cctx.drvflags &= ~(uint64_t)SLBT_DRIVER_DISABLE_STATIC;
+
cctx.drvflags |= lflags;
cctx.drvflags |= SLBT_DRIVER_SHARED;
cctx.drvflags |= SLBT_DRIVER_STATIC;