From b8db05c3ffad7fb2b46b35389cf86275c7e8c735 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 25 Feb 2015 11:19:22 +0100 Subject: OS X: Make deployment of clang lib less fragile. Ensure that the correct rpath is added, even if we fail to remove the old one. Change-Id: I96e37d0e26b04f240300244aa93f434a60013410 Reviewed-by: Nikolai Kosjar Reviewed-by: Eike Ziller --- scripts/deployqtHelper_mac.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 85f7a080c5..974e008043 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -65,7 +65,8 @@ if [ $LLVM_INSTALL_DIR ]; then _CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/libClangCodeModel.dylib" fi # this will just fail when run a second time on libClangCodeModel - xcrun install_name_tool -rpath "$LLVM_INSTALL_DIR/lib" "@loader_path/" "$_CLANG_CODEMODEL_LIB" || true + xcrun install_name_tool -delete_rpath "$LLVM_INSTALL_DIR/lib" "$_CLANG_CODEMODEL_LIB" || true + xcrun install_name_tool -add_rpath "@loader_path/" "$_CLANG_CODEMODEL_LIB" || true fi #### macdeployqt -- cgit v1.2.3