Revert "Determine whether -E/-r option selects extended regexp"

This reverts commit 7bcf18bfab84374d3305c7a088f95ac1219ddf93.

1 files changed, 3 insertions, 4 deletions

diff --git a/scripts/xldd.in b/scripts/xldd.in
index 9aa8b61f..0e8c0d07 100644
--- a/scripts/xldd.in
+++ b/scripts/xldd.in
@@ -5,7 +5,6 @@ export LC_ALL=C
 version="@@CT_VERSION@@"
 bits="@@CT_BITS@@"
 sed="${SED:-@@CT_sed@@}"
-sed_r="${SED_R:-@@CT_sed_r@@}"
 grep="${GREP:-@@CT_grep@@}"
 
 my_name="$( basename "${0}" )"
@@ -160,7 +159,7 @@ fi
 sysroot="$( "${gcc}" -print-sysroot 2>/dev/null )"
 if [ -z "${sysroot}" ]; then
     sysroot="$( "${gcc}" -print-file-name=libc.so 2>/dev/null \
-                |${sed_r} -e 's:/usr/lib/libc.so$::;'        \
+                |${sed} -r -e 's:/usr/lib/libc.so$::;'        \
               )"
 fi
 if [ -z "${sysroot}" ]; then
@@ -260,7 +259,7 @@ do_process_file() {
     save_search_rpath=( "${search_rpath[@]}" )
     for n in $( "${readelf}" -d "${file}"                                           \
                 |"${grep}" -E '\((RPATH|RUNPATH)\)'                                 \
-                |"${sed_r}" -e 's/^.*Library r(|un)path:[[:space:]]+\[(.*)\]$/\2/;'\
+                |"${sed}" -r -e 's/^.*Library r(|un)path:[[:space:]]+\[(.*)\]$/\2/;'\
               ); do
         do_trace "-> adding rpath '%s'\n" "${n}"
         search_rpath+=( "${n}" )
@@ -273,7 +272,7 @@ do_process_file() {
 
     for n in $( "${readelf}" -d "${file}"                                               \
                 |"${grep}" -E '\(NEEDED\)'                                              \
-                |"${sed_r}" -e 's/^.*Shared library:[[:space:]]+\[([^]]+)\].*/\1/;'    \
+                |"${sed}" -r -e 's/^.*Shared library:[[:space:]]+\[([^]]+)\].*/\1/;'    \
               ); do
         found=0
         for m in "${needed_list[@]}"; do