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

fix #12293 findNimStdLibCompileTime should not break with nimble install compiler (#14334)

Browse source 
* fix #12293 findNimStdLibCompileTime should not break with nimble install compiler

* address comment to unblock PR
This commit is contained in:
Timothee Cour 2020-05-18 00:38:12 -07:00 • committed by GitHub
commit b11ff518fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/nimeval.nim
View file

@ -81,6 +81,9 @@ proc findNimStdLib*(): string =
## Returns "" on failure. ## Returns "" on failure.
try: try:
let nimexe = os.findExe("nim") let nimexe = os.findExe("nim")
# this can't work with choosenim shims, refs https://github.com/dom96/choosenim/issues/189
# it'd need `nim dump --dump.format:json . | jq -r .libpath`
# which we should simplify as `nim dump --key:libpath`
if nimexe.len == 0: return "" if nimexe.len == 0: return ""
result = nimexe.splitPath()[0] /../ "lib" result = nimexe.splitPath()[0] /../ "lib"
if not fileExists(result / "system.nim"): if not fileExists(result / "system.nim"):
@ -93,8 +96,8 @@ proc findNimStdLib*(): string =
proc findNimStdLibCompileTime*(): string = proc findNimStdLibCompileTime*(): string =
## Same as ``findNimStdLib`` but uses source files used at compile time, ## Same as ``findNimStdLib`` but uses source files used at compile time,
## and asserts on error. ## and asserts on error.
const sourcePath = currentSourcePath() const exe = getCurrentCompilerExe()
result = sourcePath.parentDir.parentDir / "lib" result = exe.splitFile.dir.parentDir / "lib"
doAssert fileExists(result / "system.nim"), "result:" & result doAssert fileExists(result / "system.nim"), "result:" & result
proc createInterpreter*(scriptName: string; proc createInterpreter*(scriptName: string;