diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2019-02-08 17:18:17 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2019-02-08 17:18:17 +0100 |
| commit | 0841c64a3217594d0d260a0f24616b469447c1b9 (patch) | |
| tree | d16995b64b4cd42b7e3d9adf94dd7f7ff57b600c /tools/vccexe/vccenv.nim | |
| parent | cb9110c43d4ae9c29a0a1e0d54f7735712d4ba62 (diff) | |
| parent | 444f2231c9b48c34f9bec2ce6cfa3de5ae2560b1 (diff) | |
| download | Nim-0841c64a3217594d0d260a0f24616b469447c1b9.tar.gz | |
Merge branch 'devel' into araq-quirky-exceptions
Diffstat (limited to 'tools/vccexe/vccenv.nim')
| -rw-r--r-- | tools/vccexe/vccenv.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/vccexe/vccenv.nim b/tools/vccexe/vccenv.nim index 6ddf2e29a..12a6e6b3d 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. @@ -39,9 +39,9 @@ proc vccEnvVcVarsAllPath*(version: VccEnvVersion = vsUndefined): string = for tryVersion in [vs140, vs120, vs110, vs100, vs90]: let tryPath = vccEnvVcVarsAllPath(tryVersion) if tryPath.len > 0: - result = tryPath + return tryPath else: # Specific version requested let key = $version let val = getEnv key if val.len > 0: - result = expandFilename(val & vcvarsallRelativePath) + result = try: expandFilename(joinPath(val, vcvarsallRelativePath)) except OSError: "" |