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

Build compiler with --noNimblePath (#20168)

Browse source 
- Fixes https://github.com/nim-lang/Nim/issues/18840
This commit is contained in:
Ivan Yonchovski 2022-08-09 21:04:52 +03:00 • committed by GitHub
commit ec2bc2a50e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build_all.bat
View file

@ -24,6 +24,6 @@ if not exist %nim_csources% (
cd .. cd ..
copy /y bin\nim.exe %nim_csources% copy /y bin\nim.exe %nim_csources%
) )
bin\nim.exe c --skipUserCfg --skipParentCfg --hints:off koch bin\nim.exe c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
koch boot -d:release --skipUserCfg --skipParentCfg --hints:off koch boot -d:release --skipUserCfg --skipParentCfg --hints:off
koch tools --skipUserCfg --skipParentCfg --hints:off koch tools --skipUserCfg --skipParentCfg --hints:off

2
build_all.sh
View file

@ -11,7 +11,7 @@ set -e # exit on first error
. ci/funs.sh . ci/funs.sh
nimBuildCsourcesIfNeeded "$@" nimBuildCsourcesIfNeeded "$@"
echo_run bin/nim c --skipUserCfg --skipParentCfg --hints:off koch echo_run bin/nim c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
echo_run ./koch boot -d:release --skipUserCfg --skipParentCfg --hints:off echo_run ./koch boot -d:release --skipUserCfg --skipParentCfg --hints:off
echo_run ./koch tools --skipUserCfg --skipParentCfg --hints:off echo_run ./koch tools --skipUserCfg --skipParentCfg --hints:off

4
koch.nim
View file

@ -332,9 +332,9 @@ proc boot(args: string) =
# in order to use less memory, we split the build into two steps: # in order to use less memory, we split the build into two steps:
# --compileOnly produces a $project.json file and does not run GCC/Clang. # --compileOnly produces a $project.json file and does not run GCC/Clang.
# jsonbuild then uses the $project.json file to build the Nim binary. # jsonbuild then uses the $project.json file to build the Nim binary.
exec "$# $# $# --nimcache:$# $# --compileOnly compiler" / "nim.nim" % exec "$# $# $# --nimcache:$# $# --noNimblePath --compileOnly compiler" / "nim.nim" %
[nimi, bootOptions, extraOption, smartNimcache, args] [nimi, bootOptions, extraOption, smartNimcache, args]
exec "$# jsonscript --nimcache:$# $# compiler" / "nim.nim" % exec "$# jsonscript --noNimblePath --nimcache:$# $# compiler" / "nim.nim" %
[nimi, smartNimcache, args] [nimi, smartNimcache, args]
if sameFileContent(output, i.thVersion): if sameFileContent(output, i.thVersion):

2
tools/ci_generate.nim
View file

@ -42,7 +42,7 @@ triggers:
proc genBuildExtras(echoRun, koch, nim: string): string = proc genBuildExtras(echoRun, koch, nim: string): string =
result = fmt""" result = fmt"""
{echoRun} {nim} c --skipUserCfg --skipParentCfg --hints:off koch {echoRun} {nim} c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
{echoRun} {koch} boot -d:release --skipUserCfg --skipParentCfg --hints:off {echoRun} {koch} boot -d:release --skipUserCfg --skipParentCfg --hints:off
{echoRun} {koch} tools --skipUserCfg --skipParentCfg --hints:off {echoRun} {koch} tools --skipUserCfg --skipParentCfg --hints:off
""" """