From da4766c313bf33e5f0790583af204935f62699a0 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Mon, 26 Feb 2018 11:37:44 -0500
Subject: 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.
---
 .circleci/config.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to '.circleci/config.yml')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e4f09a3a25..295d803a6f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,17 +54,11 @@ aliases:
       name: Build
       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
-- 
cgit v1.2.1