Merge branch 'master' into 32-overlay-implementation

2026-07-18 02:46:04 +02:00 · 2020-05-25 17:34:32 +02:00
parent 125658248c ed5ac6f44f
commit a7d72c0905
3 changed files with 67 additions and 22 deletions
@@ -656,14 +656,20 @@ pbuild::install_shared_libs() {
        install_shared_libs_Linux() {
                local libs=( $(ldd "${binary}" | \
                                       awk "/ => \// && /${pattern}/ {print \$3}") )
-	        [[ -n "${libs}" ]] && cp -vL "${libs[@]}" "${dstdir}"
+	        if [[ -n "${libs}" ]]; then
+                        cp -vL "${libs[@]}" "${dstdir}" || return $?
+                fi
+                return 0
        }

        install_shared_libs_Darwin() {
                # https://stackoverflow.com/questions/33991581/install-name-tool-to-update-a-executable-to-search-for-dylib-in-mac-os-x
                local libs=( $(otool -L "${binary}" | \
                                         awk "/${pattern}/ {print \$1}"))
-	        [[ -n "${libs}" ]] && cp -vL "${libs[@]}" "${dstdir}"
+	        if [[ -n "${libs}" ]]; then
+                        cp -vL "${libs[@]}" "${dstdir}" || return $?
+                fi
+                return 0
        }

 	test -e "${binary}" || \