diff options
| author | midipix <writeonce@midipix.org> | 2016-04-28 17:17:50 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-04-28 17:17:50 -0400 |
| commit | 3e7d5bf7bb66b14b327b6997b1793a6ceb3f8fc2 (patch) | |
| tree | 8534b4fd9bea25d07cd6023fdaccf576534b1384 | |
| parent | 9b5eecc5353d43c6635a066dbd288154a9eb1ea6 (diff) | |
| download | slibtool-3e7d5bf7bb66b14b327b6997b1793a6ceb3f8fc2.tar.bz2 slibtool-3e7d5bf7bb66b14b327b6997b1793a6ceb3f8fc2.tar.xz | |
execution context: added -rpath placeholders.
| -rw-r--r-- | include/slibtool/slibtool.h | 1 | ||||
| -rw-r--r-- | src/logic/slbt_exec_ctx.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/slibtool/slibtool.h b/include/slibtool/slibtool.h index aacaa2b..30ad927 100644 --- a/include/slibtool/slibtool.h +++ b/include/slibtool/slibtool.h @@ -119,6 +119,7 @@ struct slbt_exec_ctx { char ** symdefs; char ** symfile; char ** lout[2]; + char ** rpath[2]; char ** sentinel; FILE * fwrapper; FILE * fdeps; diff --git a/src/logic/slbt_exec_ctx.c b/src/logic/slbt_exec_ctx.c index 17c6cd8..e874ec6 100644 --- a/src/logic/slbt_exec_ctx.c +++ b/src/logic/slbt_exec_ctx.c @@ -447,6 +447,10 @@ void slbt_reset_placeholders(struct slbt_exec_ctx * ectx) *ectx->lout[0] = "-USLIBTOOL_PLACEHOLDER_OUTPUT_SWITCH"; *ectx->lout[1] = "-USLIBTOOL_PLACEHOLDER_OUTPUT_FILE"; + + *ectx->rpath[0] = "-USLIBTOOL_PLACEHOLDER_RPATH_SWITCH"; + *ectx->rpath[1] = "-USLIBTOOL_PLACEHOLDER_RPATH_DIR"; + *ectx->sentinel= 0; } @@ -464,5 +468,9 @@ void slbt_disable_placeholders(struct slbt_exec_ctx * ectx) *ectx->lout[0] = 0; *ectx->lout[1] = 0; + + *ectx->rpath[0] = 0; + *ectx->rpath[1] = 0; + *ectx->sentinel= 0; } |