diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-11-12 18:25:08 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-13 09:46:56 +0100 |
commit | 280b12ce9c474d11b0d7d8a18d690edcaad91004 (patch) | |
tree | 1e58fd2929a06681f73f18d2281b35c7578efbd1 /share/qbs/modules/cpp/GenericGCC.qbs | |
parent | 93564d323514a96f6e848825e5336beff2410d2d (diff) |
introduce cpp.linkerName and cpp.linkerPath
Like the compilerName/Path, the linker must be configurable.
Change-Id: I50f9511dedbff29dbf55b41b96e213f238be187f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'share/qbs/modules/cpp/GenericGCC.qbs')
-rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 35821fdeb..ccb851ccc 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -13,6 +13,7 @@ CppModule { property string toolchainPrefix property path toolchainInstallPath compilerName: 'g++' + linkerName: "g++" property string archiverName: 'ar' property path sysroot: qbs.sysroot property path platformPath @@ -30,6 +31,7 @@ CppModule { } compilerPath: toolchainPathPrefix + compilerName + linkerPath: toolchainPathPrefix + linkerName property path archiverPath: { return toolchainPathPrefix + archiverName } readonly property bool shouldCreateSymlinks: { @@ -135,7 +137,7 @@ CppModule { args.push(libFilePath); args = args.concat(Gcc.libraryLinkerFlags(product, inputs)); args = args.concat(Gcc.additionalCompilerAndLinkerFlags(product)); - var cmd = new Command(ModUtils.moduleProperty(product, "compilerPath"), args); + var cmd = new Command(ModUtils.moduleProperty(product, "linkerPath"), args); cmd.description = 'linking ' + FileInfo.fileName(libFilePath); cmd.highlight = 'linker'; cmd.responseFileUsagePrefix = '@'; @@ -262,7 +264,7 @@ CppModule { args = args.concat(Gcc.libraryLinkerFlags(product, inputs)); args = args.concat(Gcc.additionalCompilerAndLinkerFlags(product)); - var cmd = new Command(ModUtils.moduleProperty(product, "compilerPath"), args); + var cmd = new Command(ModUtils.moduleProperty(product, "linkerPath"), args); cmd.description = 'linking ' + FileInfo.fileName(output.fileName); cmd.highlight = 'linker' cmd.responseFileUsagePrefix = '@'; |