Commit fc4c9683 authored by kaiha's avatar kaiha
Browse files

Use in-tree cabal in build.cabal.sh (works for cabal < 1.24)

Partial fix of #274

This installs the in-tree Cabal into the cabal-sandbox before building
hadrian itself. This only works if the installed cabal version is < 1.24,
because I have not yet figured out how it can be done with the newly
introduced `new-build` command.
parent e89ab5c6
......@@ -61,6 +61,11 @@ else
# Initialize sandbox if necessary
if ! ( "$CABAL" sandbox hc-pkg list > /dev/null 2>&1); then
"$CABAL" sandbox init
( cd ../libraries/Cabal/Cabal
ln -s "$absoluteRoot/cabal.sandbox.config" cabal.sandbox.config
cabal install
rm cabal.sandbox.config
)
"$CABAL" install \
--dependencies-only \
--disable-library-profiling \
......
......@@ -120,7 +120,7 @@ executable hadrian
, ScopedTypeVariables
build-depends: base >= 4.8 && < 5
, ansi-terminal == 0.6.*
, Cabal == 1.22.* || == 1.24.* || == 1.25.*
, Cabal >= 1.25
, containers == 0.5.*
, directory == 1.2.*
, extra >= 1.4.7
......
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