Skip to content

Commit

Permalink
Build compiler with --noNimblePath (nim-lang#20168)
Browse files Browse the repository at this point in the history
  • Loading branch information
yyoncho authored and capocasa committed Mar 31, 2023
1 parent 27bdc53 commit f5d530d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build_all.bat
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ if not exist %nim_csources% (
cd ..
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 tools --skipUserCfg --skipParentCfg --hints:off
2 changes: 1 addition & 1 deletion build_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set -e # exit on first error
. ci/funs.sh
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 tools --skipUserCfg --skipParentCfg --hints:off

4 changes: 2 additions & 2 deletions koch.nim
Original file line number Diff line number Diff line change
Expand Up @@ -332,9 +332,9 @@ proc boot(args: string) =
# 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.
# 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]
exec "$# jsonscript --nimcache:$# $# compiler" / "nim.nim" %
exec "$# jsonscript --noNimblePath --nimcache:$# $# compiler" / "nim.nim" %
[nimi, smartNimcache, args]

if sameFileContent(output, i.thVersion):
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_generate.nim
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ triggers:

proc genBuildExtras(echoRun, koch, nim: string): string =
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} tools --skipUserCfg --skipParentCfg --hints:off
"""
Expand Down

0 comments on commit f5d530d

Please sign in to comment.