mirror of
https://github.com/nim-lang/Nim.git
synced 2026-01-06 13:07:48 +00:00
fix vccexe not using correct path for detecting vcvarsall (#10364)
This commit is contained in:
committed by
Andreas Rumpf
parent
32a90f7406
commit
5491f40d54
@@ -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: ""
|
||||
|
||||
Reference in New Issue
Block a user