This commit is contained in:
Andreas Rumpf
2018-12-15 14:01:18 +01:00
parent e3a668a33b
commit 39ae55e6e4
2 changed files with 5 additions and 7 deletions

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:

View File

@@ -253,7 +253,7 @@ template depConfigFields*(fn) {.dirty.} =
fn(globalOptions)
fn(selectedGC)
proc mergeConfigs*(dest, src: ConfigRef) =
proc mergeConfigs*(dest, src: ConfigRef; mergeSymbols: bool) =
template merge[T: enum](a, b: T) =
a = b
template merge[T](a, b: set[T]) =
@@ -301,7 +301,8 @@ proc mergeConfigs*(dest, src: ConfigRef) =
m warnCounter
m errorMax
m configVars
m symbols
if mergeSymbols:
m symbols
m searchPaths
m lazyPaths
m outFile