fix: use library, not package, for lean root dir
This commit is contained in:
parent
f62b017654
commit
7ea0ea3393
3 changed files with 9 additions and 2 deletions
|
|
@ -25,12 +25,12 @@ def Module.soloTarget (mod : Module) (dynlibs : Array FilePath)
|
|||
let cUpToDate ← modTrace.checkAgainstFile mod.cFile mod.cTraceFile
|
||||
unless modUpToDate && cUpToDate do
|
||||
compileLeanModule mod.leanFile mod.oleanFile mod.ileanFile mod.cFile
|
||||
(← getOleanPath) mod.pkg.rootDir dynlibs dynlibPath mod.leanArgs (← getLean)
|
||||
(← getOleanPath) mod.rootDir dynlibs dynlibPath mod.leanArgs (← getLean)
|
||||
modTrace.writeToFile mod.cTraceFile
|
||||
else
|
||||
unless modUpToDate do
|
||||
compileLeanModule mod.leanFile mod.oleanFile mod.ileanFile none
|
||||
(← getOleanPath) mod.pkg.rootDir dynlibs dynlibPath mod.leanArgs (← getLean)
|
||||
(← getOleanPath) mod.rootDir dynlibs dynlibPath mod.leanArgs (← getLean)
|
||||
modTrace.writeToFile mod.traceFile
|
||||
return depTrace
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,10 @@ namespace LeanLib
|
|||
@[inline] def srcDir (self : LeanLib) : FilePath :=
|
||||
self.pkg.srcDir / self.config.srcDir
|
||||
|
||||
/-- The library's root directory for `lean` (i.e., `srcDir`). -/
|
||||
@[inline] def rootDir (self : LeanLib) : FilePath :=
|
||||
self.srcDir
|
||||
|
||||
/-- Whether the given module is considered local to the library. -/
|
||||
@[inline] def isLocalModule (mod : Name) (self : LeanLib) : Bool :=
|
||||
self.config.isLocalModule mod
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@ namespace Module
|
|||
abbrev pkg (self : Module) : Package :=
|
||||
self.lib.pkg
|
||||
|
||||
@[inline] def rootDir (self : Module) : FilePath :=
|
||||
self.lib.rootDir
|
||||
|
||||
@[inline] def leanFile (self : Module) : FilePath :=
|
||||
Lean.modToFilePath self.lib.srcDir self.name "lean"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue