Merge pull request #16 from braydonf/ldpath
Link locally to shared library using rpath.
This commit is contained in:
commit
218755d9a6
@ -63,8 +63,11 @@ ext=$($root_dir/platform/os.sh ext)
|
|||||||
echo 'Copying libbitcoind.{so|dylib} to its appropriate location.'
|
echo 'Copying libbitcoind.{so|dylib} to its appropriate location.'
|
||||||
if test -e "${root_dir}/libbitcoind/src/.libs/libbitcoind.${ext}"; then
|
if test -e "${root_dir}/libbitcoind/src/.libs/libbitcoind.${ext}"; then
|
||||||
if [ "$ext" = "dylib" ]; then
|
if [ "$ext" = "dylib" ]; then
|
||||||
cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.0.dylib" "${os_dir}/"
|
if [ ! -d "${os_dir}/lib" ]; then
|
||||||
cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.dylib" "${os_dir}/"
|
mkdir -p "${os_dir}/lib"
|
||||||
|
fi
|
||||||
|
cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.0.dylib" "${os_dir}/lib/"
|
||||||
|
cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.dylib" "${os_dir}/lib/"
|
||||||
else
|
else
|
||||||
cp -P "${root_dir}"/libbitcoind/src/.libs/libbitcoind.so* "${os_dir}/"
|
cp -P "${root_dir}"/libbitcoind/src/.libs/libbitcoind.so* "${os_dir}/"
|
||||||
fi
|
fi
|
||||||
|
|||||||
15
binding.gyp
15
binding.gyp
@ -25,10 +25,15 @@
|
|||||||
'-frtti',
|
'-frtti',
|
||||||
'-fpermissive',
|
'-fpermissive',
|
||||||
],
|
],
|
||||||
'libraries': [
|
'link_settings': {
|
||||||
'-lboost_filesystem',
|
'libraries': [
|
||||||
'<!(./platform/os.sh thread)',
|
'-lboost_filesystem',
|
||||||
'<!(./platform/os.sh lib)'
|
'<!(./platform/os.sh thread)',
|
||||||
]
|
'<!(./platform/os.sh lib)'
|
||||||
|
],
|
||||||
|
'ldflags': [
|
||||||
|
'-Wl,-rpath,<!(./platform/os.sh osdir)'
|
||||||
|
]
|
||||||
|
}
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user