jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

restore the old .nims processing behaviour; fixes #9989; fixes #9995

Browse source
This commit is contained in:
Araq 2018-12-16 18:44:29 +01:00
commit bae662fa8a
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/cmdlinehelper.nim
View file

@ -61,12 +61,7 @@ proc loadConfigsAndRunMainCommand*(self: NimProg, cache: IdentCache; conf: Confi
template runNimScriptIfExists(path: AbsoluteFile) = template runNimScriptIfExists(path: AbsoluteFile) =
let p = path # eval once let p = path # eval once
if fileExists(p): if fileExists(p):
var tempConf = newConfigRef() runNimScript(cache, p, freshDefines = false, conf)
setDefaultLibpath(tempConf)
initDefines(tempConf.symbols)
mergeConfigs(tempConf, conf, mergeSymbols = false)
runNimScript(cache, p, freshDefines = false, tempConf)
mergeConfigs(conf, tempConf, mergeSymbols = true)
# Caution: make sure this stays in sync with `loadConfigs` # Caution: make sure this stays in sync with `loadConfigs`
if optSkipSystemConfigFile notin conf.globalOptions: if optSkipSystemConfigFile notin conf.globalOptions: