From 611170782a3eb4f8e771afe90d2e336487bddf4e Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Tue, 28 Jun 2022 14:13:09 +0200 Subject: [PATCH] library-bundler: improve FreeBSD library bundling --- library-bundler | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/library-bundler b/library-bundler index 54056c41..e9a7ccdd 100755 --- a/library-bundler +++ b/library-bundler @@ -105,7 +105,7 @@ Multi::excludeLdd () { Common::noOp # FreeBSD specific elif echo "${ldd_line}" \ - | egrep -q '/libc++|/libgxxrt' + | egrep -q '/libc\+\+|/libgxxrt' then Common::noOp else @@ -176,17 +176,17 @@ Multi::getRootPrefix () { local lib_file="${1}" case "${system_name}" in - 'linux'|'freebsd') - echo "${lib_file}" \ - | cut -f2 -d'/' + 'linux') + echo 'usr' + ;; + 'freebsd'|'macos') + echo 'usr/local' ;; 'windows') basename "${lib_file}" \ | xargs -n1 -P1 which \ | cut -f2 -d'/' ;; - 'macos') - echo 'usr/local' esac } -- 2.39.2