Skip to content

Commit ab49945

Browse files
committed
Fixes
1 parent 59f27ad commit ab49945

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/packages.nim

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ proc buildPackages*(packages: openArray[string], bootstrap = false, stage = nati
189189

190190
printHeader()
191191

192+
let cross = absolutePath("../../glaucus/cross")
193+
let toolchain = absolutePath("../../glaucus/toolchain")
194+
192195
for idx, nom in queue:
193196
let package = parseInfo(nom)
194197
let archive =
@@ -253,14 +256,14 @@ proc buildPackages*(packages: openArray[string], bootstrap = false, stage = nati
253256
for (i, j) in env:
254257
putEnv(i, j)
255258

256-
let crossShell =
259+
let shellBootstrap =
257260
&"""
258261
build={execCmdEx(coreRepo / "slibtool/files/config.guess").output.strip()}
259262
host=x86_64-glaucus-linux-musl
260263
target=x86_64-pc-linux-musl
261264
262-
cross={absolutePath("../../glaucus/cross")}
263-
toolchain={absolutePath("../../glaucus/toolchain")}"""
265+
cross={cross}
266+
toolchain={toolchain}"""
264267

265268
if dirExists(radTmp / nom):
266269
setCurrentDir(radTmp / nom)
@@ -269,7 +272,7 @@ proc buildPackages*(packages: openArray[string], bootstrap = false, stage = nati
269272

270273
let shell = execCmdEx(
271274
&"""sh -efu -c '
272-
{(if bootstrap: crossShell else: ":")}
275+
{(if bootstrap: shellBootstrap else: ":")}
273276
274277
core={coreRepo}
275278
tmp={radTmp}

0 commit comments

Comments
 (0)