diff options
| author | Timothee Cour <timothee.cour2@gmail.com> | 2019-01-15 23:14:55 -0800 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2019-01-16 08:14:55 +0100 |
| commit | e0afacb9f2c182cf23c2f9dcaa87876b880752d3 (patch) | |
| tree | 1259603bf2c9176e20227665253987927de39644 | |
| parent | fbd6743ea1db89eef3dd89ceb7c0cdcb648c8055 (diff) | |
| download | Nim-e0afacb9f2c182cf23c2f9dcaa87876b880752d3.tar.gz | |
properly fix #10030 by skipping all external configs (#10324)
| -rw-r--r-- | build_all.sh | 5 | ||||
| -rw-r--r-- | doc/advopt.txt | 2 | ||||
| -rw-r--r-- | koch.nim | 7 |
3 files changed, 7 insertions, 7 deletions
diff --git a/build_all.sh b/build_all.sh index 6828bbbd8..0706dcaf2 100644 --- a/build_all.sh +++ b/build_all.sh @@ -27,9 +27,8 @@ build_nim_csources(){ [ -f $nim_csources ] || echo_run build_nim_csources # Note: if fails, may need to `cd csources && git pull` -# Note: --skipUserCfg is to prevent newer flags from -# breaking bootstrap phase -echo_run bin/nim c --skipUserCfg koch +# see D20190115T162028 +echo_run bin/nim c --skipUserCfg --skipParentCfg koch echo_run ./koch boot -d:release echo_run ./koch tools # Compile Nimble and other tools. diff --git a/doc/advopt.txt b/doc/advopt.txt index 2e91deed9..c2e09a3ff 100644 --- a/doc/advopt.txt +++ b/doc/advopt.txt @@ -77,7 +77,7 @@ Advanced options: --nilseqs:on|off allow 'nil' for strings/seqs 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 --skipParentCfg do not read the parent dirs' configuration files --skipProjCfg do not read the project's configuration file diff --git a/koch.nim b/koch.nim index 7059e87a5..1d636914d 100644 --- a/koch.nim +++ b/koch.nim @@ -287,9 +287,10 @@ proc boot(args: string) = for i in 0..2: echo "iteration: ", i+1 let extraOption = if i == 0: - "--skipUserCfg" - # forward compatibility: for bootstrap (1st iteration), avoid user flags - # that could break things, see #10030 + "--skipUserCfg --skipParentCfg" + # Note(D20190115T162028:here): the configs are skipped for bootstrap + # (1st iteration) to prevent newer flags from breaking bootstrap phase. + # fixes #10030. else: "" exec i.thVersion & " $# $# $# --nimcache:$# compiler" / "nim.nim" % [bootOptions, extraOption, args, smartNimcache] |