From 77135a342f18dca2a79e4acb505c72b0615b9a0b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 30 Mar 2017 11:49:19 +0200 Subject: macOS: Fix deployment of clang helpers They worked but still had wrong, additional rpaths to the Qt they were built with. Remove handling of ClangCodeModel which doesn't link to clang anymore. Change-Id: I5c1fa59b3659dc8205b782fa8aac8b700b17a98a Reviewed-by: Christian Stenger --- scripts/deployqtHelper_mac.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'scripts') diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index fbdcc935791..5039c89e821 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -118,14 +118,9 @@ if [ $LLVM_INSTALL_DIR ]; then cp -Rf "$(dirname "$clangsource")/$clanglinktarget" "$resource_path/clang/bin/$clanglinktarget" || exit 1 fi fi - _CLANG_CODEMODEL_LIB="$app_path/Contents/PlugIns/libClangCodeModel_debug.dylib" - if [ ! -f "$_CLANG_CODEMODEL_LIB" ]; then - _CLANG_CODEMODEL_LIB="$app_path/Contents/PlugIns/libClangCodeModel.dylib" - fi - # this will just fail when run a second time on libClangCodeModel - xcrun install_name_tool -delete_rpath "$LLVM_INSTALL_DIR/lib" "$_CLANG_CODEMODEL_LIB" || true - xcrun install_name_tool -add_rpath "@loader_path/../Frameworks" "$_CLANG_CODEMODEL_LIB" || true clangbackendArgument="-executable=$resource_path/clangbackend" + clangpchmanagerArgument="-executable=$resource_path/clangpchmanagerbackend" + clangrefactoringArgument="-executable=$resource_path/clangrefactoringbackend" fi #### macdeployqt @@ -157,6 +152,7 @@ if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then "-executable=$qbsapp-setup-qt" \ "-executable=$qbsapp-setup-toolchains" \ "-executable=$qbsapp-create-project" \ - "$qml2puppetArgument" "$clangbackendArgument" || exit 1 + "$qml2puppetArgument" \ + "$clangbackendArgument" "$clangpchmanagerArgument" "$clangrefactoringArgument" || exit 1 fi -- cgit v1.2.3