diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-12-14 12:46:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-12-14 12:46:57 -0400 |
| commit | 3a0bd261d9cfd395ed23ff43515523e6c6658c33 (patch) | |
| tree | 9186c5daf386ba8e76c47ec869a737344a5a74d1 /Utility/Lsof.hs | |
| parent | ac4b4a812da85b46e7d656b12d9ff5568ef706fd (diff) | |
fold Build/SysConfig.hs into BuildInfo via include
This avoids warnings from stack about the module not being listed in the
cabal file. So, the generated file is also renamed to Build/SysConfig.
Note that the setup program seems to be cached despite these changes; I
had to cabal clean to get cabal to update it so that Build/SysConfig was
written.
This commit was sponsored by Jochen Bartl on Patreon.
Diffstat (limited to 'Utility/Lsof.hs')
| -rw-r--r-- | Utility/Lsof.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Utility/Lsof.hs b/Utility/Lsof.hs index e3ed709ec..ab80258b7 100644 --- a/Utility/Lsof.hs +++ b/Utility/Lsof.hs @@ -10,7 +10,7 @@ module Utility.Lsof where import Common -import Build.SysConfig as SysConfig +import BuildInfo import Utility.Env import System.Posix.Types @@ -23,12 +23,12 @@ type CmdLine = String data ProcessInfo = ProcessInfo ProcessID CmdLine deriving (Show) -{- lsof is not in PATH on all systems, so SysConfig may have the absolute +{- lsof is not in PATH on all systems, so BuildInfo may have the absolute - path where the program was found. Make sure at runtime that lsof is - available, and if it's not in PATH, adjust PATH to contain it. -} setup :: IO () setup = do - let cmd = fromMaybe "lsof" SysConfig.lsof + let cmd = fromMaybe "lsof" BuildInfo.lsof when (isAbsolute cmd) $ do path <- getSearchPath let path' = takeDirectory cmd : path |