Commit 002d709e authored by Mikhail Glushenkov's avatar Mikhail Glushenkov

Revert the 'hs-source-dirs: src' change.

parent b453d30f
......@@ -38,7 +38,7 @@ script:
- ./misc/travis-diff-files.sh
- mkdir -p ./dist/setup
- cp Setup.hs ./dist/setup/setup.hs
- ghc --make -odir ./dist/setup -hidir ./dist/setup -i -isrc ./dist/setup/setup.hs -o ./dist/setup/setup -Wall -Werror -threaded # the command cabal-install would use to build setup
- ghc --make -odir ./dist/setup -hidir ./dist/setup -i -i. ./dist/setup/setup.hs -o ./dist/setup/setup -Wall -Werror -threaded # the command cabal-install would use to build setup
# Install test dependencies only after setup is built
- cabal install --only-dependencies --enable-tests --enable-benchmarks
......
......@@ -192,7 +192,6 @@ library
ghc-options: -Wall -fno-ignore-asserts -fwarn-tabs
hs-source-dirs: src
exposed-modules:
Distribution.Compat.CreatePipe
Distribution.Compat.Environment
......
......@@ -72,7 +72,7 @@ To build and test the `Cabal` library, do:
So, compile Setup.hs:
~~~~
ghc --make -threaded -i -isrc Setup.hs
ghc --make -threaded Setup.hs
~~~~
4. However, we _do_ want to use the sandbox package database that was created
......
......@@ -21,7 +21,7 @@ setup() {
# Install dependencies
cabal install --only-dependencies --enable-tests || die "$NAME: Could not install needed dependencies"
# Build the 'Setup' executable
ghc --make -threaded -i -isrc Setup.hs || die "$NAME: Could not create 'Setup' executable"
ghc --make -threaded -i -i. Setup.hs || die "$NAME: Could not create 'Setup' executable"
# Build the package
local PACKAGEDB=`cabal exec -- sh -c 'echo $GHC_PACKAGE_PATH' | sed 's/:.*//'`
echo "Cabal package DB location: $PACKAGEDB"
......
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