summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure6
-rw-r--r--configure.ac6
2 files changed, 10 insertions, 2 deletions
diff --git a/configure b/configure
index 8501479a..74b17689 100755
--- a/configure
+++ b/configure
@@ -6661,10 +6661,14 @@ if test $build_elfutils = yes; then
esac
{ echo "$as_me:$LINENO: running ${elfutils_srcdir}/configure" >&5
echo "$as_me: running ${elfutils_srcdir}/configure" >&6;}
+ # Our libdw.so's libebl will look in $ORIGIN/../lib/... but that
+ # $ORIGIN is where libdw.so resides, which is not where there is a ../lib.
+ elfutils_rpath="-Wl,--enable-new-dtags,-rpath,${libdir}/${PACKAGE_NAME}"
here=`pwd`
(mkdir -p build-elfutils && cd build-elfutils &&
${elfutils_srcdir}/configure --enable-libebl-subdir=${PACKAGE_NAME} \
--includedir="${here}/include-elfutils" \
- --libdir="${here}/lib-elfutils"
+ --libdir="${here}/lib-elfutils" \
+ LDFLAGS="$LDFLAGS $elfutils_rpath"
)
fi
diff --git a/configure.ac b/configure.ac
index bf455795..cfad5c57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,10 +62,14 @@ if test $build_elfutils = yes; then
*) elfutils_srcdir="../$with_elfutils" ;;
esac
AC_MSG_NOTICE([running ${elfutils_srcdir}/configure])
+ # Our libdw.so's libebl will look in $ORIGIN/../lib/... but that
+ # $ORIGIN is where libdw.so resides, which is not where there is a ../lib.
+ elfutils_rpath="-Wl,--enable-new-dtags,-rpath,${libdir}/${PACKAGE_NAME}"
here=`pwd`
(mkdir -p build-elfutils && cd build-elfutils &&
${elfutils_srcdir}/configure --enable-libebl-subdir=${PACKAGE_NAME} \
--includedir="${here}/include-elfutils" \
- --libdir="${here}/lib-elfutils"
+ --libdir="${here}/lib-elfutils" \
+ LDFLAGS="$LDFLAGS $elfutils_rpath"
)
fi