summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2021-04-03 20:10:08 +0000
committermidipix <writeonce@midipix.org>2021-04-03 20:12:42 +0000
commit611918fdc4201b8ebcd266481f90976bbc9255d0 (patch)
tree8cd308ee964ee678ca6c14338dbbe507cc78d2e8
parentd4c3e3af3e27781da414714e63ef52c9c711e1b6 (diff)
downloadslibtool-611918fdc4201b8ebcd266481f90976bbc9255d0.tar.bz2
slibtool-611918fdc4201b8ebcd266481f90976bbc9255d0.tar.xz
install mode: always respect the SLBT_DRIVER_ANNOTATE_NEVER flag.
-rw-r--r--src/logic/slbt_exec_install.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/logic/slbt_exec_install.c b/src/logic/slbt_exec_install.c
index 7277179..4aafd0f 100644
--- a/src/logic/slbt_exec_install.c
+++ b/src/logic/slbt_exec_install.c
@@ -29,7 +29,8 @@ static int slbt_install_usage(
const char * program,
const char * arg,
const struct argv_option ** optv,
- struct argv_meta * meta)
+ struct argv_meta * meta,
+ int noclr)
{
char header[512];
@@ -38,7 +39,16 @@ static int slbt_install_usage(
"Options:\n",
program);
- argv_usage(fdout,header,optv,arg);
+ switch (noclr) {
+ case 0:
+ argv_usage(fdout,header,optv,arg);
+ break;
+
+ default:
+ argv_usage_plain(fdout,header,optv,arg);
+ break;
+ }
+
argv_free(meta);
return SLBT_USAGE;
@@ -646,7 +656,8 @@ int slbt_exec_install(
return slbt_install_usage(
fdout,
dctx->program,
- 0,optv,0);
+ 0,optv,0,
+ dctx->cctx->drvflags & SLBT_DRIVER_ANNOTATE_NEVER);
}
}
@@ -657,7 +668,8 @@ int slbt_exec_install(
return slbt_install_usage(
fdout,
dctx->program,
- 0,optv,0);
+ 0,optv,0,
+ dctx->cctx->drvflags & SLBT_DRIVER_ANNOTATE_NEVER);
/* <install> argv meta */
if (!(meta = argv_get(