digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-19 16:57:40 +03:00
Code Issues Projects Releases Wiki Activity

cleanup locateRunfiles jank

Browse Source
This commit is contained in:
Sofia Faro 2020-12-14 14:48:49 +00:00
parent f9f03597e8
commit 82552003ae
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/damlc/daml-opts/daml-opts/DA/Daml/Options.hs
View File

@ -432,18 +432,13 @@ setImports paths dflags = dflags { importPaths = paths }
locateGhcVersionHeader :: IO GhcVersionHeader
locateGhcVersionHeader = GhcVersionHeader <$> do
resourcesDir <- locateRunfiles (mainWorkspace </> "compiler" </> "damlc" </> "ghcversion.h")
isDirectory <- doesDirectoryExist resourcesDir
let path | isDirectory = resourcesDir </> "ghcversion.h"
| otherwise = resourcesDir
pure path
resourcesDir <- locateRunfiles (mainWorkspace </> "compiler" </> "damlc")
pure (resourcesDir </> "ghcversion.h")
locateCppPath :: IO (Maybe FilePath)
locateCppPath = do
resourcesDir <- locateRunfiles (mainWorkspace </> "compiler" </> "damlc" </> "hpp")
isDirectory <- doesDirectoryExist resourcesDir
let path | isDirectory = resourcesDir </> "hpp"
| otherwise = resourcesDir
resourcesDir <- locateRunfiles (mainWorkspace </> "compiler" </> "damlc")
let path = resourcesDir </> "hpp"
exists <- doesFileExist path
pure (guard exists >> Just path)