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

properly fix #10030 by skipping all external configs (#10324)

Browse source
This commit is contained in:
Timothee Cour 2019-01-15 23:14:55 -08:00 • committed by Andreas Rumpf
commit e0afacb9f2
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build_all.sh
View file

@ -27,9 +27,8 @@ build_nim_csources(){
[ -f $nim_csources ] || echo_run build_nim_csources [ -f $nim_csources ] || echo_run build_nim_csources
# Note: if fails, may need to `cd csources && git pull` # Note: if fails, may need to `cd csources && git pull`
# Note: --skipUserCfg is to prevent newer flags from # see D20190115T162028
# breaking bootstrap phase echo_run bin/nim c --skipUserCfg --skipParentCfg koch
echo_run bin/nim c --skipUserCfg koch
echo_run ./koch boot -d:release echo_run ./koch boot -d:release
echo_run ./koch tools # Compile Nimble and other tools. echo_run ./koch tools # Compile Nimble and other tools.

2
doc/advopt.txt
View file

@ -77,7 +77,7 @@ Advanced options:
--nilseqs:on|off allow 'nil' for strings/seqs for --nilseqs:on|off allow 'nil' for strings/seqs for
backwards compatibility backwards compatibility
--oldast:on|off use old AST for backwards compatibility --oldast:on|off use old AST for backwards compatibility
--skipCfg do not read the general configuration file --skipCfg do not read the nim installation's configuration file
--skipUserCfg do not read the user's configuration file --skipUserCfg do not read the user's configuration file
--skipParentCfg do not read the parent dirs' configuration files --skipParentCfg do not read the parent dirs' configuration files
--skipProjCfg do not read the project's configuration file --skipProjCfg do not read the project's configuration file

7
koch.nim
View file

@ -287,9 +287,10 @@ proc boot(args: string) =
for i in 0..2: for i in 0..2:
echo "iteration: ", i+1 echo "iteration: ", i+1
let extraOption = if i == 0: let extraOption = if i == 0:
"--skipUserCfg" "--skipUserCfg --skipParentCfg"
# forward compatibility: for bootstrap (1st iteration), avoid user flags # Note(D20190115T162028:here): the configs are skipped for bootstrap
# that could break things, see #10030 # (1st iteration) to prevent newer flags from breaking bootstrap phase.
# fixes #10030.
else: "" else: ""
exec i.thVersion & " $# $# $# --nimcache:$# compiler" / "nim.nim" % exec i.thVersion & " $# $# $# --nimcache:$# compiler" / "nim.nim" %
[bootOptions, extraOption, args, smartNimcache] [bootOptions, extraOption, args, smartNimcache]