@@ -26,14 +26,7 @@ if [ -d "$ENV_DIR" ]; then
2626fi
2727
2828WORK_DIR=/app
29−echo "AAAAAAAAAAAA"
30−cat "$WORK_DIR/Makefile"
3129cp -Rp "$BUILD_DIR/." "$WORK_DIR"
32−echo "XXXXXXXXXXXX"
33−ls "$BUILD_DIR"
34−echo "YYYYYYYYYYYY"
35−ls "$WORK_DIR"
36−echo "ZZZZZZZZZZZZ"
3730mkdir -p "$WORK_DIR/vendor/bin"
3831mkdir -p "$WORK_DIR/vendor/ghc-libs"
3932
@@ -52,7 +45,7 @@ function set-default-env (){
5245}
5346
5447export LANG=en_US.UTF-8
55−export LIBRARY_PATH=$WORK_DIR/vendor/ghc-libs:/usr/lib:$LIBRARY_PATH
48+export LIBRARY_PATH=$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib:$LIBRARY_PATH
5649export LD_LIBRARY_PATH=$LIBRARY_PATH
5750export PATH=$WORK_DIR/.local/bin:$WORK_DIR/vendor/bin:$PATH
5851export STACK_ROOT=$CACHE_DIR/.stack
@@ -70,7 +63,7 @@ speak "Restoring $LIBGMP_VER files from cache"
7063cp -Rp "$LIBGMP_DIR/ghc-libs/." "$WORK_DIR/vendor/ghc-libs"
7164
7265########## stack exe ###############################################
73−STACK_VER=${STACK_VER:-1.4.0}
66+STACK_VER=${STACK_VER:-2.1.3}
7467STACK_URL=${STACK_URL:-https://github.com/commercialhaskell/stack/releases/download/v"$STACK_VER"/stack-"$STACK_VER"-linux-x86_64.tar.gz}
7568STACK_DIR="$CACHE_DIR/stack-$STACK_VER"
7669STACK_EXE="$STACK_DIR/stack"
@@ -107,13 +100,14 @@ if [ -f "$BUILD_DIR/Makefile" ]; then
107100 make install
108101else
109102 stack setup
110− stack build --fast --copy-bins
103+ stack clean
104+ stack build --ghc-options='-O2' --copy-bins
111105fi
112106
113107# Set context environment variables.
114−set-env PATH "$WORK_DIR/.local/bin:$PATH"
115−set-default-env LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:/usr/lib"
116−set-default-env LD_LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:/usr/lib"
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"
117111
118112speak "Making stack binaries available"
119113mkdir -p "$BUILD_DIR/vendor"