aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-04-06 15:53:19 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-04-06 14:50:53 +0000
commitacd57d05d87c17103ee9d3ecfc514ff217adf2cc (patch)
tree2fbbb4470d6084ac8a29e4de794297307486b5a0
parentf8056d62f316b1cce13a3341f18923dec4d45b28 (diff)
cpp module: Add toolchain install path to build environment
... for mingw. There are DLLs there which are needed by helper tools located in a different path. Change-Id: I20f4937f5e88a75d7261d86885182317965eee91 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--share/qbs/modules/cpp/GenericGCC.qbs7
1 files changed, 6 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 61da31138..9afb93064 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -209,7 +209,12 @@ CppModule {
return v.split('.')[0];
}
- property var buildEnv: ({})
+ property var buildEnv: {
+ var env = {};
+ if (qbs.toolchain.contains("mingw"))
+ env.PATH = [toolchainInstallPath]; // For libwinpthread etc
+ return env;
+ }
exceptionHandlingModel: {
if (qbs.toolchain.contains("mingw")) {