From f2bf6c9a3634196c006ec1c4825db94abd0f5116 Mon Sep 17 00:00:00 2001 From: Yuchen Deng <loaden@gmail.com> Date: Sat, 4 Aug 2012 15:27:43 +0800 Subject: [PATCH] qbs files: Strip binary files for 'gcc/mingw + release' Change-Id: I62a4afc5dff6323db916bfdd19431aaeb0c9d2a5 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> --- qtcreator.qbp | 4 ++++ src/libs/QtcLibrary.qbs | 6 ++++++ src/plugins/QtcPlugin.qbs | 6 +++++- src/tools/QtcTool.qbs | 6 ++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/qtcreator.qbp b/qtcreator.qbp index 65b61a7e020..2994372c5f4 100644 --- a/qtcreator.qbp +++ b/qtcreator.qbp @@ -132,6 +132,10 @@ Project { cpp.rpaths: ["$ORIGIN/../lib/qtcreator"] cpp.defines: project.additionalCppDefines + cpp.linkerFlags: { + if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw")) + return ["-Wl,-s"] + } cpp.includePaths: [ "src", "src/libs", diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs index a8e02d738ac..efacb4adf12 100644 --- a/src/libs/QtcLibrary.qbs +++ b/src/libs/QtcLibrary.qbs @@ -1,6 +1,12 @@ import qbs.base 1.0 DynamicLibrary { + Depends { name: "cpp" } + cpp.linkerFlags: { + if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw")) + return ["-Wl,-s"] + } + destination: { if (qbs.targetOS == "windows") return "bin" diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs index 239fb4712a3..83b33f78d1c 100644 --- a/src/plugins/QtcPlugin.qbs +++ b/src/plugins/QtcPlugin.qbs @@ -20,9 +20,13 @@ Product { } Depends { name: "pluginspec" } - Depends { name: 'cpp' } + Depends { name: "cpp" } cpp.defines: [name.toUpperCase() + "_LIBRARY"] cpp.rpaths: ["$ORIGIN/../../.."] + cpp.linkerFlags: { + if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw")) + return ["-Wl,-s"] + } Group { files: [ name + ".pluginspec.in" ] diff --git a/src/tools/QtcTool.qbs b/src/tools/QtcTool.qbs index 2c8c43f767d..9632ecc0982 100644 --- a/src/tools/QtcTool.qbs +++ b/src/tools/QtcTool.qbs @@ -1,5 +1,11 @@ import qbs.base 1.0 Application { + Depends { name: "cpp" } + cpp.linkerFlags: { + if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw")) + return ["-Wl,-s"] + } + destination: "bin" } -- GitLab