Merge pull request #295099 from Qyriad/maint/autopatchelf-single-line
autoPatchelfHook: move multiline hook into a function
This commit is contained in:
commit
fb1539a8c8
1 changed files with 13 additions and 14 deletions
|
@ -88,6 +88,7 @@ autoPatchelf() {
|
|||
--extra-args "${patchelfFlagsArray[@]}"
|
||||
}
|
||||
|
||||
autoPatchelfPostFixup() {
|
||||
# XXX: This should ultimately use fixupOutputHooks but we currently don't have
|
||||
# a way to enforce the order. If we have $runtimeDependencies set, the setup
|
||||
# hook of patchelf is going to ruin everything and strip out those additional
|
||||
|
@ -96,14 +97,12 @@ autoPatchelf() {
|
|||
# So what we do here is basically run in postFixup and emulate the same
|
||||
# behaviour as fixupOutputHooks because the setup hook for patchelf is run in
|
||||
# fixupOutput and the postFixup hook runs later.
|
||||
#
|
||||
# shellcheck disable=SC2016
|
||||
# (Expressions don't expand in single quotes, use double quotes for that.)
|
||||
postFixupHooks+=('
|
||||
if [ -z "${dontAutoPatchelf-}" ]; then
|
||||
if [[ -z "${dontAutoPatchelf-}" ]]; then
|
||||
autoPatchelf -- $(for output in $(getAllOutputNames); do
|
||||
[ -e "${!output}" ] || continue
|
||||
echo "${!output}"
|
||||
done)
|
||||
fi
|
||||
')
|
||||
}
|
||||
|
||||
postFixupHooks+=(autoPatchelfPostFixup)
|
||||
|
|
Loading…
Reference in a new issue