diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-12-13 11:53:47 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-01-10 10:57:54 +0000 |
| commit | 998abe9b7a530338f71ce42ee3dea96a3248e613 (patch) | |
| tree | 223ae2a73621d8d06778ca9dc0eb232ab5461887 /scripts | |
| parent | 80e0cb56ec145ea13293cec104cdcd85d653a04b (diff) | |
macOS/deployHelper: Accept if clazy-standalone already has right rpath
Adding an already existing rpath is an error for install_name_tool.
Not completely failing in that case makes local testing easier.
Change-Id: I22d94225af2375af4e397212b2a7500315f25882
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 3387b67847..e8f46032a4 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -168,7 +168,7 @@ if [ $LLVM_INSTALL_DIR ]; then cp -Rf "$clangtidysource" "$libexec_path/clang/bin/" || exit 1 clazysource="$LLVM_INSTALL_DIR"/bin/clazy-standalone cp -Rf "$clazysource" "$libexec_path/clang/bin/" || exit 1 - install_name_tool -add_rpath "@executable_path/../lib" "$libexec_path/clang/bin/clazy-standalone" || exit 1 + install_name_tool -add_rpath "@executable_path/../lib" "$libexec_path/clang/bin/clazy-standalone" 2> /dev/null install_name_tool -delete_rpath "/Users/qt/work/build/libclang/lib" "$libexec_path/clang/bin/clazy-standalone" 2> /dev/null fi clangbackendArgument="-executable=$libexec_path/clangbackend" |