From 4c4f6541d956b3d5ee098fd4e3d4ab9ca794fc64 Mon Sep 17 00:00:00 2001 From: nigredo-tori Date: Mon, 6 Feb 2017 14:06:37 +0700 Subject: [PATCH] Don't prepend project path to absolute filenames passed to setCommand (#5341) --- compiler/scriptconfig.nim | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/compiler/scriptconfig.nim b/compiler/scriptconfig.nim index 245680eecd..9e94f1c19e 100644 --- a/compiler/scriptconfig.nim +++ b/compiler/scriptconfig.nim @@ -110,10 +110,13 @@ proc setupVM*(module: PSym; cache: IdentCache; scriptName: string; let arg = a.getString 1 if arg.len > 0: gProjectName = arg + let path = + if gProjectName.isAbsolute: gProjectName + else: gProjectPath / gProjectName try: - gProjectFull = canonicalizePath(gProjectPath / gProjectName) + gProjectFull = canonicalizePath(path) except OSError: - gProjectFull = gProjectName + gProjectFull = path cbconf getCommand: setResult(a, options.command) cbconf switch: