projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge in new code generator branch.
[ghc-hetmet.git]
/
utils
/
ghc-cabal
/
Main.hs
diff --git
a/utils/ghc-cabal/Main.hs
b/utils/ghc-cabal/Main.hs
index
a4566f1
..
d75696f
100644
(file)
--- a/
utils/ghc-cabal/Main.hs
+++ b/
utils/ghc-cabal/Main.hs
@@
-11,7
+11,7
@@
import Distribution.Simple.Configure
import Distribution.Simple.LocalBuildInfo
import Distribution.Simple.Program
import Distribution.Simple.Program.HcPkg
import Distribution.Simple.LocalBuildInfo
import Distribution.Simple.Program
import Distribution.Simple.Program.HcPkg
-import Distribution.Simple.Utils (defaultPackageDesc, writeFileAtomic)
+import Distribution.Simple.Utils (defaultPackageDesc, writeFileAtomic, toUTF8)
import Distribution.Simple.Build (writeAutogenFiles)
import Distribution.Simple.Register
import Distribution.Text
import Distribution.Simple.Build (writeAutogenFiles)
import Distribution.Simple.Register
import Distribution.Text
@@
-298,7
+298,7
@@
generate config_args distdir directory
Installed.haddockHTMLs = ["../" ++ display (packageId pd)]
}
content = Installed.showInstalledPackageInfo final_ipi ++ "\n"
Installed.haddockHTMLs = ["../" ++ display (packageId pd)]
}
content = Installed.showInstalledPackageInfo final_ipi ++ "\n"
- writeFileAtomic (distdir </> "inplace-pkg-config") content
+ writeFileAtomic (distdir </> "inplace-pkg-config") (toUTF8 content)
_ -> error "Inconsistent lib components; can't happen?"
let
_ -> error "Inconsistent lib components; can't happen?"
let