From c8a9f76a32ed1123fc898b717a2f53551ff73f45 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Fri, 21 Jul 2017 11:12:46 +0200 Subject: [PATCH] Remove the workaround to install libstdc++-6.dll Summary: In version 5.9.0, Qt fixed installing file names containing the plus sign. Reviewers: #swift_pilot_client, msutcliffe Reviewed By: #swift_pilot_client, msutcliffe Subscribers: jenkins Differential Revision: https://dev.swift-project.org/D45 --- install.pri | 9 +-------- src/xswiftbus/xswiftbus.pro | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/install.pri b/install.pri index 8020fa9bf..c10ede117 100644 --- a/install.pri +++ b/install.pri @@ -224,6 +224,7 @@ win32-g++ { VC_RUNTIME_LIBS *= libgcc_s_seh-1 } VC_RUNTIME_LIBS *= libwinpthread-1 + VC_RUNTIME_LIBS *= libstdc++-6 vc_runtime_target.path *= $${PREFIX}/bin @@ -232,14 +233,6 @@ win32-g++ { } INSTALLS += vc_runtime_target - - # libstdc++-6.dll needs a workaround since copy does not accept a filepath with '+' in it - vc_runtime_target.depends += copy_libstdc - copy_libstdc.target = copy_libstdc - source_path = $$[QT_INSTALL_BINS]/libstdc++-6.dll - dest_path = $$vc_runtime_target.path - copy_libstdc.commands = xcopy /Y $$shell_path($$source_path) $$shell_path($$dest_path) - QMAKE_EXTRA_TARGETS += copy_libstdc } ############### Install externals ############## diff --git a/src/xswiftbus/xswiftbus.pro b/src/xswiftbus/xswiftbus.pro index e5c0395dd..89995860c 100644 --- a/src/xswiftbus/xswiftbus.pro +++ b/src/xswiftbus/xswiftbus.pro @@ -188,14 +188,7 @@ win32-g++ { dep_target.files *= $$[QT_INSTALL_BINS]/libgcc_s_seh-1.dll } dep_target.files *= $$[QT_INSTALL_BINS]/libwinpthread-1.dll - - # libstdc++-6.dll needs a workaround since copy does not accept a filepath with '+' in it - dep_target.depends += copy_libstdc - copy_libstdc.target = copy_libstdc - source_path = $$[QT_INSTALL_BINS]/libstdc++-6.dll - dest_path = $$PREFIX/$$XSWIFTBUS_DIR - copy_libstdc.commands = xcopy /Y $$shell_path($$source_path) $$shell_path($$dest_path) - QMAKE_EXTRA_TARGETS += copy_libstdc + dep_target.files *= $$[QT_INSTALL_BINS]/libstdc++-6.dll } INSTALLS += dep_target