Commit 94dbe9d7 authored by Andrey Mokhov's avatar Andrey Mokhov Committed by GitHub

Fix ghc-cabal build (#455)

See #395, #453
parent a6797641
packages: ../libraries/Cabal/Cabal/ packages: ./
./ ../libraries/Cabal/Cabal/
../libraries/filepath/
../libraries/text/
../libraries/hpc/
../libraries/parsec/
...@@ -11,14 +11,21 @@ ghcCabalPackageArgs = stage0 ? package ghcCabal ? builder Ghc ? do ...@@ -11,14 +11,21 @@ ghcCabalPackageArgs = stage0 ? package ghcCabal ? builder Ghc ? do
cabalDeps <- expr $ stage1Dependencies cabal cabalDeps <- expr $ stage1Dependencies cabal
cabalVersion <- expr $ pkgVersion (unsafePkgCabalFile cabal) -- TODO: improve cabalVersion <- expr $ pkgVersion (unsafePkgCabalFile cabal) -- TODO: improve
mconcat mconcat
[ pure [ "-package " ++ pkgName pkg | pkg <- cabalDeps, pkg /= parsec ] [ pure [ "-package " ++ pkgName pkg | pkg <- cabalDeps \\ [parsec, mtl] ]
, arg "--make" , arg "--make"
, arg "-j" , arg "-j"
, pure ["-Wall", "-fno-warn-unused-imports", "-fno-warn-warnings-deprecations"] , pure ["-Wall", "-fno-warn-unused-imports", "-fno-warn-warnings-deprecations"]
, arg ("-DCABAL_VERSION=" ++ replace "." "," cabalVersion) , arg ("-DCABAL_VERSION=" ++ replace "." "," cabalVersion)
, arg "-DCABAL_PARSEC"
, arg "-DBOOTSTRAPPING" , arg "-DBOOTSTRAPPING"
, arg "-DMIN_VERSION_binary_0_8_0" , arg "-DMIN_VERSION_binary_0_8_0"
, arg "libraries/text/cbits/cbits.c"
, arg "-ilibraries/Cabal/Cabal" , arg "-ilibraries/Cabal/Cabal"
, arg "-ilibraries/binary/src" , arg "-ilibraries/binary/src"
, arg "-ilibraries/filepath" , arg "-ilibraries/filepath"
, arg "-ilibraries/hpc" ] , arg "-ilibraries/hpc"
, arg "-ilibraries/mtl"
, arg "-ilibraries/text"
, arg "-Ilibraries/text/include"
, arg "-ilibraries/parsec" ]
...@@ -7,6 +7,10 @@ resolver: lts-9.0 ...@@ -7,6 +7,10 @@ resolver: lts-9.0
packages: packages:
- '.' - '.'
- '../libraries/Cabal/Cabal' - '../libraries/Cabal/Cabal'
- '../libraries/filepath/'
- '../libraries/text/'
- '../libraries/hpc/'
- '../libraries/parsec/'
extra-deps: extra-deps:
- shake-0.16 - shake-0.16
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment