Commit b8db05c3 authored by Eike Ziller's avatar Eike Ziller
Browse files

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: default avatarNikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent d4d677ed
...@@ -65,7 +65,8 @@ if [ $LLVM_INSTALL_DIR ]; then ...@@ -65,7 +65,8 @@ if [ $LLVM_INSTALL_DIR ]; then
_CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/libClangCodeModel.dylib" _CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/libClangCodeModel.dylib"
fi fi
# this will just fail when run a second time on libClangCodeModel # 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 fi
#### macdeployqt #### macdeployqt
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment