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

make bootstrapping more robust for people who have Nim inside /usr/bin (#13855)

Browse source
This commit is contained in:
Andreas Rumpf 2020-04-03 10:25:15 +02:00 • committed by GitHub
commit 2b3b24a804
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/vmops.nim
View file

@ -102,9 +102,10 @@ proc staticWalkDirImpl(path: string, relative: bool): PNode =
result.add newTree(nkTupleConstr, newIntNode(nkIntLit, k.ord), result.add newTree(nkTupleConstr, newIntNode(nkIntLit, k.ord),
newStrNode(nkStrLit, f)) newStrNode(nkStrLit, f))
from std / compilesettings import SingleValueSetting, MultipleValueSetting when defined(nimHasInvariant):
from std / compilesettings import SingleValueSetting, MultipleValueSetting
proc querySettingImpl(a: VmArgs, conf: ConfigRef, switch: BiggestInt): string = proc querySettingImpl(a: VmArgs, conf: ConfigRef, switch: BiggestInt): string =
case SingleValueSetting(switch) case SingleValueSetting(switch)
of arguments: result = conf.arguments of arguments: result = conf.arguments
of outFile: result = conf.outFile.string of outFile: result = conf.outFile.string
@ -119,7 +120,7 @@ proc querySettingImpl(a: VmArgs, conf: ConfigRef, switch: BiggestInt): string =
of compileOptions: result = conf.compileOptions of compileOptions: result = conf.compileOptions
of ccompilerPath: result = conf.cCompilerPath of ccompilerPath: result = conf.cCompilerPath
proc querySettingSeqImpl(a: VmArgs, conf: ConfigRef, switch: BiggestInt): seq[string] = proc querySettingSeqImpl(a: VmArgs, conf: ConfigRef, switch: BiggestInt): seq[string] =
template copySeq(field: untyped): untyped = template copySeq(field: untyped): untyped =
for i in field: result.add i.string for i in field: result.add i.string
@ -181,6 +182,7 @@ proc registerAdditionalOps*(c: PCtx) =
systemop getCurrentException systemop getCurrentException
registerCallback c, "stdlib.*.staticWalkDir", proc (a: VmArgs) {.nimcall.} = registerCallback c, "stdlib.*.staticWalkDir", proc (a: VmArgs) {.nimcall.} =
setResult(a, staticWalkDirImpl(getString(a, 0), getBool(a, 1))) setResult(a, staticWalkDirImpl(getString(a, 0), getBool(a, 1)))
when defined(nimHasInvariant):
registerCallback c, "stdlib.compilesettings.querySetting", proc (a: VmArgs) {.nimcall.} = registerCallback c, "stdlib.compilesettings.querySetting", proc (a: VmArgs) {.nimcall.} =
setResult(a, querySettingImpl(a, c.config, getInt(a, 0))) setResult(a, querySettingImpl(a, c.config, getInt(a, 0)))
registerCallback c, "stdlib.compilesettings.querySettingSeq", proc (a: VmArgs) {.nimcall.} = registerCallback c, "stdlib.compilesettings.querySettingSeq", proc (a: VmArgs) {.nimcall.} =