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 /Assistant.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 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant.hs b/Assistant.hs index 81aa036f6..dc358c2bd 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -48,7 +48,7 @@ import Assistant.Types.UrlRenderer import qualified Utility.Daemon import Utility.ThreadScheduler import Utility.HumanTime -import qualified Build.SysConfig as SysConfig +import qualified BuildInfo import Annex.Perms import Utility.LogFile #ifdef mingw32_HOST_OS @@ -135,7 +135,7 @@ startDaemon assistant foreground startdelay cannotrun listenhost startbrowser = #else go _webappwaiter = do #endif - notice ["starting", desc, "version", SysConfig.packageversion] + notice ["starting", desc, "version", BuildInfo.packageversion] urlrenderer <- liftIO newUrlRenderer #ifdef WITH_WEBAPP let webappthread = [ assist $ webAppThread d urlrenderer False cannotrun Nothing listenhost webappwaiter ] |