Add linker flags so that shared libraries are found relative to either the wterl layout or the Riak layout.

This commit is contained in:
Gregory Burd 2013-03-28 22:21:36 -04:00
parent 1595ce3096
commit e3219ff2c5
2 changed files with 4 additions and 3 deletions

View file

@ -30,7 +30,8 @@ case "$1" in
--enable-bzip2 \
--prefix=$BASEDIR/system && \
make -j && make install)
cp system/bin/wt ../priv
cp system/lib/*.so ../priv
[ -d $BASEDIR/../priv ] || mkdir $BASEDIR/../priv
cp $BASEDIR/system/bin/wt $BASEDIR/../priv
cp $BASEDIR/system/lib/*.so $BASEDIR/../priv
;;
esac

View file

@ -37,7 +37,7 @@
{port_env, [
{"DRV_CFLAGS", "$DRV_CFLAGS -Werror -I c_src/system/include"},
{"DRV_LDFLAGS", "$DRV_LDFLAGS -Wl,-rpath -Wl,priv -Lpriv -lwiredtiger"}
{"DRV_LDFLAGS", "$DRV_LDFLAGS -Wl,-rpath,lib/wterl/priv:priv -Lpriv -lwiredtiger"}
]}.
{pre_hooks, [{compile, "c_src/build_deps.sh"}]}.