[commit: ghc] wip/docker-ghcci: Silly whoops (107bb36)

[git at git.haskell.org]

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

On branch  : wip/docker-ghcci
Link       : http://ghc.haskell.org/trac/ghc/changeset/107bb36cdbf5939f2aba4b16227553692afad353/ghc

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

commit 107bb36cdbf5939f2aba4b16227553692afad353
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Feb 27 17:50:38 2018 -0500

    Silly whoops


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

107bb36cdbf5939f2aba4b16227553692afad353
 .circleci/images/x86_64-freebsd/Dockerfile | 1 -
 .circleci/prepare-system.sh                | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.circleci/images/x86_64-freebsd/Dockerfile b/.circleci/images/x86_64-freebsd/Dockerfile
index 1c9916d..5ab8f58 100644
--- a/.circleci/images/x86_64-freebsd/Dockerfile
+++ b/.circleci/images/x86_64-freebsd/Dockerfile
@@ -32,6 +32,5 @@ RUN apt-get install -y --no-install-recommends \
   texinfo \
   lbzip2
 
-RUN ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour
 COPY build-toolchain.sh /tmp/
 RUN /tmp/build-toolchain.sh x86_64
diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh
index 6365c29..ed01658 100755
--- a/.circleci/prepare-system.sh
+++ b/.circleci/prepare-system.sh
@@ -22,12 +22,13 @@ EOF
 
 case "$(uname)" in
   Linux)
+    cabal update
+    cabal install --reinstall hscolour --index-state=$hackage_index_state
+    ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour
+
     if [[ -n ${TARGET:-} ]]; then
       if [[ $TARGET = FreeBSD ]]; then
         # cross-compiling to FreeBSD
-        cabal update
-        cabal install --reinstall hscolour --index-state=$hackage_index_state
-
         echo 'HADDOCK_DOCS = NO' >> mk/build.mk
         echo 'WERROR=' >> mk/build.mk
         # https://circleci.com/docs/2.0/env-vars/#interpolating-environment-variables-to-set-other-environment-variables
@@ -37,8 +38,6 @@ case "$(uname)" in
       fi
     else
       # assuming Ubuntu
-      cabal update
-      cabal install --reinstall hscolour --index-state=$hackage_index_state
     fi
     ;;
   Darwin)