diff options
| author | roland <roland> | 2005-12-22 23:05:20 +0000 |
|---|---|---|
| committer | roland <roland> | 2005-12-22 23:05:20 +0000 |
| commit | b7165f651cf81233d8102e6036279483ab3298f4 (patch) | |
| tree | 62f2041c52e2ef78198ea24e6a033dc41fd1282f | |
| parent | 2a971a9f13f6e3cdabc429051c9944191080c8f9 (diff) | |
| download | systemtap-steved-b7165f651cf81233d8102e6036279483ab3298f4.tar.gz systemtap-steved-b7165f651cf81233d8102e6036279483ab3298f4.tar.xz systemtap-steved-b7165f651cf81233d8102e6036279483ab3298f4.zip | |
2005-12-22 Roland McGrath <roland@redhat.com>
* configure.ac: Pass LDFLAGS to elfutils configure to force DT_RUNPATH.
* configure: Regeneraed.
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 10 insertions, 2 deletions
@@ -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 |