nvidia-x11: Set 32-bit library paths for 32-bit libraries.

Patchelf was being called to point RUNPATH to 64-bit library paths even for 32-bit libraries.
This commit is contained in:
Ambroz Bizjak
2019-06-15 10:54:50 +02:00
committed by Frederik Rietdijk
parent 0b8efd8724
commit d1226bff8e
2 changed files with 11 additions and 4 deletions
+5 -1
View File
@@ -102,7 +102,11 @@ installPhase() {
do
# I'm lazy to differentiate needed libs per-library, as the closure is the same.
# Unfortunately --shrink-rpath would strip too much.
patchelf --set-rpath "$out/lib:$libPath" "$libname"
if [[ -n $lib32 && $libname == "$lib32/lib/"* ]]; then
patchelf --set-rpath "$lib32/lib:$libPath32" "$libname"
else
patchelf --set-rpath "$out/lib:$libPath" "$libname"
fi
libname_short=`echo -n "$libname" | sed 's/so\..*/so/'`