#Fixes #24536 building nimble 0.16.4 fails when running build_all.sh (#24537)

(cherry picked from commit 556f217b4c)
This commit is contained in:
Juan M Gómez
2024-12-16 07:05:00 +00:00
committed by narimiran
parent cd06f0769f
commit 7b596b4e1f
4 changed files with 7 additions and 5 deletions

View File

@@ -26,4 +26,4 @@ if not exist %nim_csources% (
)
bin\nim.exe c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
koch boot -d:release --skipUserCfg --skipParentCfg --hints:off
koch tools --skipUserCfg --skipParentCfg --hints:off
koch tools --skipUserCfg --hints:off

View File

@@ -13,5 +13,5 @@ nimBuildCsourcesIfNeeded "$@"
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
echo_run ./koch tools --skipUserCfg --hints:off

View File

@@ -44,7 +44,7 @@ proc genBuildExtras(echoRun, koch, nim: string): string =
result = fmt"""
{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
{echoRun}{koch} tools --skipUserCfg --hints:off
"""
proc genWindowsScript(buildAll: bool): string =

View File

@@ -46,5 +46,7 @@ proc cloneDependency*(destDirBase: string, url: string, commit = commitHead,
proc updateSubmodules*(dir: string) =
let oldDir = getCurrentDir()
setCurrentDir(dir)
exec "git submodule update --init"
setCurrentDir(oldDir)
try:
exec "git submodule update --init"
finally:
setCurrentDir(oldDir)