[commit: ghc] master: circleci: Simplify Hadrian build (da4766c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/da4766c313bf33e5f0790583af204935f62699a0/ghc

>---------------------------------------------------------------

commit da4766c313bf33e5f0790583af204935f62699a0
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Feb 26 11:37:44 2018 -0500

    circleci: Simplify Hadrian build
    
    This uses the build.sh script included in the Hadrian tree, ensuring that we
    will build Cabal from git if necessary.


>---------------------------------------------------------------

da4766c313bf33e5f0790583af204935f62699a0
 .circleci/config.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e4f09a3..295d803 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,16 +55,10 @@ aliases:
       command: "make -j$THREADS"
   - &build_hadrian
     run:
-      name: Build Hadrian
-      command: |
-        cd hadrian
-        cabal update
-        cabal install
-  - &build_ghc_hadrian
-    run:
       name: Build GHC using Hadrian
       command: |
-        $HOME/.cabal/bin/hadrian -j$THREADS
+        cabal update
+        hadrian/build.sh -j$THREADS
   - &test
     run:
       name: Test
@@ -169,7 +163,6 @@ jobs:
       - *boot
       - *configure_unix
       - *build_hadrian
-      - *build_ghc_hadrian
 
   "validate-x86_64-linux-unreg":
     resource_class: xlarge