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

fixes #9995

Browse source
This commit is contained in:
Andreas Rumpf 2018-12-15 14:01:18 +01:00
commit 39ae55e6e4
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/cmdlinehelper.nim
View file

@ -64,12 +64,9 @@ proc loadConfigsAndRunMainCommand*(self: NimProg, cache: IdentCache; conf: Confi
var tempConf = newConfigRef()
setDefaultLibpath(tempConf)
initDefines(tempConf.symbols)
tempConf.command = conf.command
tempConf.commandArgs = conf.commandArgs
tempConf.searchPaths = conf.searchPaths
tempConf.lazyPaths = conf.lazyPaths
mergeConfigs(tempConf, conf, mergeSymbols = false)
runNimScript(cache, p, freshDefines = false, tempConf)
mergeConfigs(conf, tempConf)
mergeConfigs(conf, tempConf, mergeSymbols = true)
# Caution: make sure this stays in sync with `loadConfigs`
if optSkipSystemConfigFile notin conf.globalOptions: