From 03e72e46cbbde146046bbc85fca41e90bcebad57 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Thu, 27 Jul 2023 16:57:22 -0400 Subject: [PATCH] cudaPackages.autoAddOpenGLRunpathHook: fix to skip unsupported/unneed --- .../auto-add-opengl-runpath-hook.sh | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh b/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh index 0b0da336514a..395229ca79b7 100644 --- a/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh +++ b/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh @@ -1,14 +1,24 @@ -# Run autoOpenGLRunpath on all files +# shellcheck shell=bash +# Run addOpenGLRunpath on all dynamically linked, ELF files echo "Sourcing auto-add-opengl-runpath-hook" -autoAddOpenGLRunpathPhase () { - # TODO: support multiple outputs - for file in $(find ${out,lib,bin} -type f); do - addOpenGLRunpath $file - done -} +autoAddOpenGLRunpathPhase() ( + local outputPaths + mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done) + find "${outputPaths[@]}" -type f -executable -print0 | while IFS= read -rd "" f; do + if isELF "$f"; then + # patchelf returns an error on statically linked ELF files + if patchelf --print-interpreter "$f" >/dev/null 2>&1; then + echo "autoAddOpenGLRunpathHook: patching $f" + addOpenGLRunpath "$f" + elif [ -n "${DEBUG-}" ]; then + echo "autoAddOpenGLRunpathHook: skipping ELF file $f" + fi + fi + done +) if [ -z "${dontUseAutoAddOpenGLRunpath-}" ]; then - echo "Using autoAddOpenGLRunpathPhase" - postFixupHooks+=(autoAddOpenGLRunpathPhase) + echo "Using autoAddOpenGLRunpathPhase" + postFixupHooks+=(autoAddOpenGLRunpathPhase) fi