[commit: ghc] wip/nfs-locking: Fix travis script: configure after shake-build is in place. (b978e17)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:24:23 UTC 2017


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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/b978e17552d87de8973a5bdd0255da5d1baa7d51/ghc

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

commit b978e17552d87de8973a5bdd0255da5d1baa7d51
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jan 5 10:29:08 2016 +0000

    Fix travis script: configure after shake-build is in place.


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

b978e17552d87de8973a5bdd0255da5d1baa7d51
 .travis/install-ghc-shake.sh | 3 +++
 .travis/install-ghc.sh       | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis/install-ghc-shake.sh b/.travis/install-ghc-shake.sh
index 2dc0392..c2b8774 100755
--- a/.travis/install-ghc-shake.sh
+++ b/.travis/install-ghc-shake.sh
@@ -14,3 +14,6 @@ mv .git "$SHAKEDIR/"
 echo -e "${COLOR}Installing deps into sandbox${RESET}"
 ( cd "$SHAKEDIR" && cabal sandbox init )
 ( cd "$SHAKEDIR" && cabal install --only-dependencies . )
+
+echo -e "${COLOR}GHC boot/configure${RESET}"
+( cd ghc && ./boot && ./configure)
diff --git a/.travis/install-ghc.sh b/.travis/install-ghc.sh
index 126cbe2..fc34ea4 100755
--- a/.travis/install-ghc.sh
+++ b/.travis/install-ghc.sh
@@ -10,6 +10,3 @@ git clone git://git.haskell.org/ghc
 
 echo -e "${COLOR}Initialize GHC submodules${RESET}"
 ( cd ghc && git submodule update --init )
-
-echo -e "${COLOR}GHC boot/configure${RESET}"
-( cd ghc && ./boot && ./configure)



More information about the ghc-commits mailing list