diff options
| author | midipix <writeonce@midipix.org> | 2016-04-22 04:26:59 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-04-23 09:25:08 -0400 |
| commit | 63a1b4f797559545e3ed60b387e969ecf79d3e57 (patch) | |
| tree | 32873d7a3ca67aaf1e1b528bfa13b51d6adb796d | |
| parent | f5fa4cfd2ddab00584b0382e8a8f9c26b18b5c09 (diff) | |
| download | slibtool-63a1b4f797559545e3ed60b387e969ecf79d3e57.tar.bz2 slibtool-63a1b4f797559545e3ed60b387e969ecf79d3e57.tar.xz | |
driver: added -bindir support.
| -rw-r--r-- | src/driver/slbt_driver_ctx.c | 4 | ||||
| -rw-r--r-- | src/internal/slibtool_driver_impl.h | 1 | ||||
| -rw-r--r-- | src/skin/slbt_skin_default.c | 6 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/driver/slbt_driver_ctx.c b/src/driver/slbt_driver_ctx.c index 673cfeb..1e8d958 100644 --- a/src/driver/slbt_driver_ctx.c +++ b/src/driver/slbt_driver_ctx.c @@ -238,6 +238,10 @@ static int slbt_split_argv( } else if (argv[i][1] == 'R') { *targv++ = argv[i]; + } else if (!(strcmp("bindir",&argv[i][1]))) { + *targv++ = argv[i++]; + *targv++ = argv[i]; + } else if (!(strcmp("rpath",&argv[i][1]))) { *targv++ = argv[i++]; *targv++ = argv[i]; diff --git a/src/internal/slibtool_driver_impl.h b/src/internal/slibtool_driver_impl.h index 2ecc652..8ffb611 100644 --- a/src/internal/slibtool_driver_impl.h +++ b/src/internal/slibtool_driver_impl.h @@ -32,6 +32,7 @@ enum app_tags { TAG_RANLIB, TAG_DLLTOOL, TAG_OUTPUT, + TAG_BINDIR, TAG_LDRPATH, TAG_RPATH, TAG_RELEASE, diff --git a/src/skin/slbt_skin_default.c b/src/skin/slbt_skin_default.c index e3c0ce2..2b74632 100644 --- a/src/skin/slbt_skin_default.c +++ b/src/skin/slbt_skin_default.c @@ -86,6 +86,12 @@ const struct argv_option slbt_default_options[] = { "encode library path into the executable image " "[currently a no-op]"}, + {"bindir", 0,TAG_BINDIR,ARGV_OPTARG_REQUIRED, + ARGV_OPTION_HYBRID_ONLY|ARGV_OPTION_HYBRID_SPACE,0,0, + "override destination directory when installing " + "PE shared libraries. Not needed, ignored for " + "compatibility"}, + {"rpath", 0,TAG_RPATH,ARGV_OPTARG_REQUIRED, ARGV_OPTION_HYBRID_ONLY|ARGV_OPTION_HYBRID_SPACE,0,0, "where a library should eventually be " |