From bae662fa8a5ab005a13ff7f5a0d08f22b14cb6ec Mon Sep 17 00:00:00 2001 From: Araq Date: Sun, 16 Dec 2018 18:44:29 +0100 Subject: [PATCH] restore the old .nims processing behaviour; fixes #9989; fixes #9995 --- compiler/cmdlinehelper.nim | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/compiler/cmdlinehelper.nim b/compiler/cmdlinehelper.nim index fa1eb38168..5e7afa0ba4 100644 --- a/compiler/cmdlinehelper.nim +++ b/compiler/cmdlinehelper.nim @@ -61,12 +61,7 @@ proc loadConfigsAndRunMainCommand*(self: NimProg, cache: IdentCache; conf: Confi template runNimScriptIfExists(path: AbsoluteFile) = let p = path # eval once if fileExists(p): - var tempConf = newConfigRef() - setDefaultLibpath(tempConf) - initDefines(tempConf.symbols) - mergeConfigs(tempConf, conf, mergeSymbols = false) - runNimScript(cache, p, freshDefines = false, tempConf) - mergeConfigs(conf, tempConf, mergeSymbols = true) + runNimScript(cache, p, freshDefines = false, conf) # Caution: make sure this stays in sync with `loadConfigs` if optSkipSystemConfigFile notin conf.globalOptions: