feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Mac: Don't fail with error if deployqt is called multiple times

Browse Source 
Change-Id: I19753fab58dae1e430adc76b96af4ef7ea690995
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2014-02-04 16:14:51 +01:00
parent b7c7a82060
commit 0eae696743
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/deployqtHelper_mac.sh
+4 -2
View File
@@ -57,11 +57,13 @@ cp "$2"/*.qm "$1/Contents/Resources/translations/" || exit 1
# copy libclang if needed
if [ $LLVM_INSTALL_DIR ]; then
cp -f "$LLVM_INSTALL_DIR"/lib/libclang.dylib "$1/Contents/PlugIns/" || exit 1
if [ "$LLVM_INSTALL_DIR"/lib/libclang.dylib -nt "$1/Contents/PlugIns"/libclang.dylib ]; then
cp -f "$LLVM_INSTALL_DIR"/lib/libclang.dylib "$1/Contents/PlugIns/" || exit 1
fi
_CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/QtProject/libClangCodeModel_debug.dylib"
if [ ! -f "$_CLANG_CODEMODEL_LIB" ]; then
_CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/QtProject/libClangCodeModel.dylib"
fi
xcrun install_name_tool -delete_rpath "$LLVM_INSTALL_DIR/lib" -add_rpath "@loader_path/.." "$_CLANG_CODEMODEL_LIB"
xcrun install_name_tool -rpath "$LLVM_INSTALL_DIR/lib" "@loader_path/.." "$_CLANG_CODEMODEL_LIB" || true
fi