diff options
author | Neelesh Chandola <neelesh.chandola@outlook.com> | 2019-01-21 14:35:23 +0530 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2019-01-21 10:05:23 +0100 |
commit | 5491f40d544494d4277d17669ca1fe0713d66f35 (patch) | |
tree | 52faddfeb38a1d9c45c5aad7f915e69816657ac1 /tools/vccexe | |
parent | 32a90f74063c3ee238a4909d8678720d93545014 (diff) | |
download | Nim-5491f40d544494d4277d17669ca1fe0713d66f35.tar.gz |
fix vccexe not using correct path for detecting vcvarsall (#10364)
Diffstat (limited to 'tools/vccexe')
-rw-r--r-- | tools/vccexe/vccenv.nim | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/vccexe/vccenv.nim b/tools/vccexe/vccenv.nim index 724fe992a..bd3b0b30a 100644 --- a/tools/vccexe/vccenv.nim +++ b/tools/vccexe/vccenv.nim @@ -16,7 +16,7 @@ type vs140 = (140, "VS140COMNTOOLS") ## Visual Studio 2015 const - vcvarsallRelativePath = joinPath("..", "..", "VC", "vcvarsall") ## Relative path from the COMNTOOLS path to the vcvarsall file. + vcvarsallRelativePath = joinPath("..", "..", "VC", "vcvarsall.bat") ## Relative path from the COMNTOOLS path to the vcvarsall file. proc vccEnvVcVarsAllPath*(version: VccEnvVersion = vsUndefined): string = ## Returns the path to the VCC Developer Command Prompt executable for the specified VCC version. @@ -44,4 +44,4 @@ proc vccEnvVcVarsAllPath*(version: VccEnvVersion = vsUndefined): string = let key = $version let val = getEnv key if val.len > 0: - result = try: expandFilename(val & vcvarsallRelativePath) except OSError: "" + result = try: expandFilename(joinPath(val, vcvarsallRelativePath)) except OSError: "" |