From a7cfd045b751ab18d18c4767fb0c866226b59200 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: May 21 2021 14:51:04 +0000 Subject: wrap-find-debuginfo.sh: Enable separate debugedit program (cherry picked from commit 79751685db592c8189aa104c725801fd0eec9dd4) --- diff --git a/wrap-find-debuginfo.sh b/wrap-find-debuginfo.sh index 5ace7e6..598c0d3 100644 --- a/wrap-find-debuginfo.sh +++ b/wrap-find-debuginfo.sh @@ -13,6 +13,13 @@ set -ex ldso_tmp="$(mktemp)" +# Prefer a separately installed debugedit over the RPM-integrated one. +if command -v debugedit >/dev/null ; then + debugedit=debugedit +else + debugedit=/usr/lib/rpm/debugedit +fi + cleanup () { rm -f "$ldso_tmp" } @@ -56,8 +63,7 @@ while true ; do esac done debug_base_name=${last_arg:-$RPM_BUILD_ROOT} -/usr/lib/rpm/debugedit -b "$debug_base_name" -d "$debug_dest_name" -n \ - $ldso_path +$debugedit -b "$debug_base_name" -d "$debug_dest_name" -n $ldso_path # Apply single-file DWARF optimization. dwz $ldso_path