Commit 9acbd355 authored by Jelte Jansen's avatar Jelte Jansen
Browse files

[1558] try both -R and -Wl,-R as rpath compiler flags

parent 079133e3
...@@ -53,11 +53,18 @@ AC_MSG_CHECKING([whether -R flag is available in linker]) ...@@ -53,11 +53,18 @@ AC_MSG_CHECKING([whether -R flag is available in linker])
LDFLAGS_SAVED="$LDFLAGS" LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS -R/usr/lib" LDFLAGS="$LDFLAGS -R/usr/lib"
AC_TRY_LINK([],[], AC_TRY_LINK([],[],
[ AC_MSG_RESULT(yes) [ AC_MSG_RESULT(yes)
rpath_available=yes rpath_flag=-R
],[ AC_MSG_RESULT(no) ],[ AC_MSG_RESULT(no)
rpath_available=no AC_MSG_CHECKING([whether -Wl,-R flag is available in linker])
]) LDFLAGS="$LDFLAGS_SAVED -Wl,-R"
AC_TRY_LINK([], [],
[ AC_MSG_RESULT(yes)
rpath_flag=-Wl,-R
],[ AC_MSG_RESULT(no)
rpath_flag=no
])
])
LDFLAGS=$LDFLAGS_SAVED LDFLAGS=$LDFLAGS_SAVED
# allow building programs with static link. we need to make it selective # allow building programs with static link. we need to make it selective
...@@ -202,10 +209,10 @@ fi ...@@ -202,10 +209,10 @@ fi
# modules, we embed the path to the modules when possible. We do this even # modules, we embed the path to the modules when possible. We do this even
# when the path is known in the common operational environment (e.g. when # when the path is known in the common operational environment (e.g. when
# it's stored in a common "hint" file) for simplicity. # it's stored in a common "hint" file) for simplicity.
if test $rpath_available = yes; then if test $rpath_flag != no; then
python_rpath= python_rpath=
for flag in ${PYTHON_LDFLAGS}; do for flag in ${PYTHON_LDFLAGS}; do
python_rpath="${python_rpath} `echo $flag | sed -ne 's/^\(\-L\)/-R/p'`" python_rpath="${python_rpath} `echo $flag | sed -ne "s/^\(\-L\)/${rpath_flag}/p"`"
done done
PYTHON_LDFLAGS="${PYTHON_LDFLAGS} ${python_rpath}" PYTHON_LDFLAGS="${PYTHON_LDFLAGS} ${python_rpath}"
fi fi
...@@ -534,10 +541,10 @@ for flag in ${BOTAN_LIBS}; do ...@@ -534,10 +541,10 @@ for flag in ${BOTAN_LIBS}; do
done done
# See python_rpath for some info on why we do this # See python_rpath for some info on why we do this
if test $rpath_available = yes; then if test $rpath_flag != no; then
BOTAN_RPATH= BOTAN_RPATH=
for flag in ${BOTAN_LIBS}; do for flag in ${BOTAN_LIBS}; do
BOTAN_RPATH="${BOTAN_RPATH} `echo $flag | sed -ne 's/^\(\-L\)/-R/p'`" BOTAN_RPATH="${BOTAN_RPATH} `echo $flag | sed -ne "s/^\(\-L\)/${rpath_flag}/p"`"
done done
AC_SUBST(BOTAN_RPATH) AC_SUBST(BOTAN_RPATH)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment