diff options
| author | midipix <writeonce@midipix.org> | 2016-04-16 09:12:11 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-04-16 09:12:11 -0400 |
| commit | 523027d6556bfaec8ae90ad7114405daaa336573 (patch) | |
| tree | 44a3dfe8e7f33d51e35f65d8fcde4fcc6eb8e90a /src | |
| parent | e8159c12c7562791bf9affed06bc0c3be849b590 (diff) | |
| download | slibtool-523027d6556bfaec8ae90ad7114405daaa336573.tar.bz2 slibtool-523027d6556bfaec8ae90ad7114405daaa336573.tar.xz | |
driver: added -R support [no-op].
Diffstat (limited to 'src')
| -rw-r--r-- | src/driver/slbt_driver_ctx.c | 7 | ||||
| -rw-r--r-- | src/internal/slibtool_driver_impl.h | 1 | ||||
| -rw-r--r-- | src/skin/slbt_skin_default.c | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/src/driver/slbt_driver_ctx.c b/src/driver/slbt_driver_ctx.c index 7d0b91f..6c2990e 100644 --- a/src/driver/slbt_driver_ctx.c +++ b/src/driver/slbt_driver_ctx.c @@ -231,6 +231,13 @@ static int slbt_split_argv( *targv++ = argv[i++]; *targv++ = argv[i]; + } else if ((argv[i][1] == 'R') && (argv[i][2] == '\0')) { + *targv++ = argv[i++]; + *targv++ = argv[i]; + + } else if (argv[i][1] == 'R') { + *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 c0c137c..8e64e1e 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_LDRPATH, TAG_RPATH, TAG_RELEASE, TAG_EXPSYM_FILE, diff --git a/src/skin/slbt_skin_default.c b/src/skin/slbt_skin_default.c index 829b9d7..996c9cc 100644 --- a/src/skin/slbt_skin_default.c +++ b/src/skin/slbt_skin_default.c @@ -81,6 +81,11 @@ const struct argv_option slbt_default_options[] = { "set an explicit (cross-)target, then pass it to " "the compiler"}, + {"R", 0,TAG_LDRPATH,ARGV_OPTARG_REQUIRED, + ARGV_OPTION_HYBRID_ONLY|ARGV_OPTION_HYBRID_CIRCUS,0,0, + "encode library path into the executable image " + "[currently a no-op]"}, + {"rpath", 0,TAG_RPATH,ARGV_OPTARG_REQUIRED, ARGV_OPTION_HYBRID_ONLY|ARGV_OPTION_HYBRID_SPACE,0,0, "where a library should eventually be " |