aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules/cpp/windows-msvc.qbs
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-05-15 11:39:25 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2013-05-15 17:05:22 +0200
commitd452158b3b1d69b455892c082a1e3ef4406308b6 (patch)
treeef16afa8eda1c998a7f950ecb0c2c135a4706577 /share/qbs/modules/cpp/windows-msvc.qbs
parent796726bb5f003f89e82745fd01abb85543e8e960 (diff)
fix MSVC lib.exe call
Rely on the PATH variable in the build environment to call lib.exe like we do for all other tools. Change-Id: I3a89531882660b7d02169ff4c9a1f6cd26e5da48 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'share/qbs/modules/cpp/windows-msvc.qbs')
-rw-r--r--share/qbs/modules/cpp/windows-msvc.qbs9
1 files changed, 1 insertions, 8 deletions
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index 63fdb2b04..af217085f 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -190,8 +190,6 @@ CppModule {
}
prepare: {
- var toolchainInstallPath = ModUtils.moduleProperty(product, "toolchainInstallPath")
-
var args = ['/nologo']
var nativeOutputFileName = FileInfo.toWindowsSeparators(output.fileName)
args.push('/OUT:' + nativeOutputFileName)
@@ -199,12 +197,7 @@ CppModule {
var fileName = FileInfo.toWindowsSeparators(inputs.obj[i].fileName)
args.push(fileName)
}
- var is64bit = (ModUtils.moduleProperty(product, "architecture") == "x86_64")
- var linkerPath = toolchainInstallPath + '/VC/bin/'
- if (is64bit)
- linkerPath += 'amd64/'
- linkerPath += 'lib.exe'
- var cmd = new Command(linkerPath, args)
+ var cmd = new Command("lib.exe", args);
cmd.description = 'creating ' + FileInfo.fileName(output.fileName)
cmd.highlight = 'linker';
cmd.workingDirectory = FileInfo.path(output.fileName)