diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-05-27 08:48:42 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-05-30 14:28:53 +0000 |
| commit | 784d3b062005d0b81ee8b6cd4fdfe680ee4a9a56 (patch) | |
| tree | 492a6bbc6c047bd3970ae53e5db5bb9337fcea78 /share/qbs | |
| parent | 6d2c14a681bd38ce3f0bc2db4685f28683146b68 (diff) | |
| download | qbs-784d3b062005d0b81ee8b6cd4fdfe680ee4a9a56.tar.gz | |
Gcc: differentiate between sysroot and syslibroot
This will be needed for an upcoming patch supporting newer revisions of
the Android NDK.
Change-Id: Iaa5703dc91d0f5b2992d9615f83fbb8be3dd1505
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs')
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 3 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/gcc.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 9266f1ed0..dd7618e06 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -111,7 +111,8 @@ CppModule { property string stripName: "strip" property string dsymutilName: "dsymutil" property string lipoName: "lipo" - property path sysroot: qbs.sysroot + property string sysroot: qbs.sysroot + property string syslibroot: sysroot property string linkerMode: "automatic" PropertyOptions { diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js index bb6c9d363..3beb90ef5 100644 --- a/share/qbs/modules/cpp/gcc.js +++ b/share/qbs/modules/cpp/gcc.js @@ -262,7 +262,7 @@ function linkerFlags(project, product, inputs, output) { if (targetLinkerFlags) args = args.concat(escapeLinkerFlags(product, inputs, targetLinkerFlags)); - var sysroot = product.cpp.sysroot; + var sysroot = product.cpp.syslibroot; if (sysroot) { if (product.qbs.toolchain.contains("qcc")) args = args.concat(escapeLinkerFlags(product, inputs, ["--sysroot=" + sysroot])); |