diff options
| author | Araq <rumpf_a@web.de> | 2018-12-16 18:44:29 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-12-16 18:44:29 +0100 |
| commit | bae662fa8a5ab005a13ff7f5a0d08f22b14cb6ec (patch) | |
| tree | 5225153c2c5a95bcd0aa00a94047cfbbfc68f447 | |
| parent | 6e5c2af203895da094171f3b7b81fbeaece1654a (diff) | |
| download | Nim-bae662fa8a5ab005a13ff7f5a0d08f22b14cb6ec.tar.gz | |
restore the old .nims processing behaviour; fixes #9989; fixes #9995
| -rw-r--r-- | compiler/cmdlinehelper.nim | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/compiler/cmdlinehelper.nim b/compiler/cmdlinehelper.nim index fa1eb3816..5e7afa0ba 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: |