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/CopyFile.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/CopyFile.hs')
| -rw-r--r-- | Utility/CopyFile.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Utility/CopyFile.hs b/Utility/CopyFile.hs index 01c600504..4ad85b7db 100644 --- a/Utility/CopyFile.hs +++ b/Utility/CopyFile.hs @@ -14,7 +14,7 @@ module Utility.CopyFile ( ) where import Common -import qualified Build.SysConfig as SysConfig +import qualified BuildInfo data CopyMetaData -- Copy timestamps when possible, but no other metadata, and @@ -34,11 +34,11 @@ copyFileExternal meta src dest = do where #ifndef __ANDROID__ params = map snd $ filter fst - [ (SysConfig.cp_reflink_auto, Param "--reflink=auto") - , (allmeta && SysConfig.cp_a, Param "-a") - , (allmeta && SysConfig.cp_p && not SysConfig.cp_a + [ (BuildInfo.cp_reflink_auto, Param "--reflink=auto") + , (allmeta && BuildInfo.cp_a, Param "-a") + , (allmeta && BuildInfo.cp_p && not BuildInfo.cp_a , Param "-p") - , (not allmeta && SysConfig.cp_preserve_timestamps + , (not allmeta && BuildInfo.cp_preserve_timestamps , Param "--preserve=timestamps") ] #else |