diff options
| author | Andrey Mokhov <andrey.mokhov@gmail.com> | 2017-11-15 21:58:19 +0000 |
|---|---|---|
| committer | Andrey Mokhov <andrey.mokhov@gmail.com> | 2017-11-15 21:58:19 +0000 |
| commit | 07ac921f48baea84b40835b0b7c476806f7f63f6 (patch) | |
| tree | 87e6616372d029c1a5d4fc14272916219e1f6948 /hadrian/circle.yml | |
| parent | ec080ea1f160263282500b30444cb2db857f2f93 (diff) | |
| parent | c1fcd9b3f60e8420dd228cd4e3efeb9cfa793aa5 (diff) | |
| download | haskell-07ac921f48baea84b40835b0b7c476806f7f63f6.tar.gz | |
Pull recent Hadrian changes from upstream
Merge commit 'c1fcd9b3f60e8420dd228cd4e3efeb9cfa793aa5'
Diffstat (limited to 'hadrian/circle.yml')
| -rw-r--r-- | hadrian/circle.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hadrian/circle.yml b/hadrian/circle.yml index a386d72da8..e9a4b6a09e 100644 --- a/hadrian/circle.yml +++ b/hadrian/circle.yml @@ -21,7 +21,8 @@ compile: - git config --global url."git://github.com/ghc/packages-".insteadOf git://github.com/ghc/packages/ - git clone --depth 1 --recursive git://github.com/ghc/ghc - - mkdir ghc/hadrian + # GHC comes with an older version of Hadrian, so we delete it + - rm -r ghc/hadrian/* # move hadrian's .git into ./ghc/hadrian and perform a hard reset in order to regenerate Hadrian files - mv .git ghc/hadrian # NOTE: we must write them in the same line because each line @@ -30,10 +31,10 @@ compile: # XXX: export PATH doesn't work well either, so we use inline env # Self test - - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.sh selftest + - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.sh -c selftest # Build GHC - - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.sh -j $MODE --no-progress --progress-colour=never --profile=- + - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.sh -j -c $MODE --no-progress --progress-colour=never --profile=- test: override: |