From 5491f40d544494d4277d17669ca1fe0713d66f35 Mon Sep 17 00:00:00 2001 From: Neelesh Chandola Date: Mon, 21 Jan 2019 14:35:23 +0530 Subject: fix vccexe not using correct path for detecting vcvarsall (#10364) --- tools/vccexe/vccenv.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/vccexe') 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: "" -- cgit 1.4.1-2-gfad0 /akkartik/mu/?h=main'>summary refs log blame commit diff stats
path: root/html/018jump_disp32.cc.html
blob: 3c220097dbd40340ffe9b1f3bde8d1ce1ff99f18 (plain) (tree)
1
2
3
4
5
6
7
8
9