@@ -45,7 +45,7 @@ function set-default-env (){
4545}
4646
4747export LANG=en_US.UTF-8
48−export LIBRARY_PATH=$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib:$LIBRARY_PATH
48+export LIBRARY_PATH=$WORK_DIR/vendor/ghc-libs:/usr/lib:$LIBRARY_PATH
4949export LD_LIBRARY_PATH=$LIBRARY_PATH
5050export PATH=$WORK_DIR/.local/bin:$WORK_DIR/vendor/bin:$PATH
5151export STACK_ROOT=$CACHE_DIR/.stack
@@ -63,7 +63,7 @@ speak "Restoring $LIBGMP_VER files from cache"
6363cp -Rp "$LIBGMP_DIR/ghc-libs/." "$WORK_DIR/vendor/ghc-libs"
6464
6565########## stack exe ###############################################
66−STACK_VER=${STACK_VER:-2.1.3}
66+STACK_VER=${STACK_VER:-1.6.1}
6767STACK_URL=${STACK_URL:-https://github.com/commercialhaskell/stack/releases/download/v"$STACK_VER"/stack-"$STACK_VER"-linux-x86_64.tar.gz}
6868STACK_DIR="$CACHE_DIR/stack-$STACK_VER"
6969STACK_EXE="$STACK_DIR/stack"
@@ -100,14 +100,13 @@ if [ -f "$BUILD_DIR/Makefile" ]; then
100100 make install
101101else
102102 stack setup
103− stack clean
104− stack build --ghc-options='-O2' --copy-bins
103+ stack build --fast --copy-bins
105104fi
106105
107106# Set context environment variables.
108−set-env PATH "$WORK_DIR/.local/bin:$WORK_DIR/vendor/bin:\$PATH"
109−set-default-env LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib"
110−set-default-env LD_LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib"
107+set-env PATH "$WORK_DIR/.local/bin:$PATH"
108+set-default-env LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:/usr/lib"
109+set-default-env LD_LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:/usr/lib"
111110
112111speak "Making stack binaries available"
113112mkdir -p "$BUILD_DIR/vendor"