diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-12-15 14:01:18 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-12-15 14:01:18 +0100 |
| commit | 39ae55e6e4082e43619973e1b4a95d0a8f2d591a (patch) | |
| tree | cc356ebf3efed03791cea6e2677da1130aa754c8 /compiler/cmdlinehelper.nim | |
| parent | e3a668a33baaf9d89b287827eaab3fa1cdfec877 (diff) | |
| download | Nim-39ae55e6e4082e43619973e1b4a95d0a8f2d591a.tar.gz | |
fixes #9995
Diffstat (limited to 'compiler/cmdlinehelper.nim')
| -rw-r--r-- | compiler/cmdlinehelper.nim | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/compiler/cmdlinehelper.nim b/compiler/cmdlinehelper.nim index 13090ce9c..fa1eb3816 100644 --- a/compiler/cmdlinehelper.nim +++ b/compiler/cmdlinehelper.nim @@ -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: |