on master help sign in
Add back previously broken benchmarks
81a7de0Ryan Scott
build-constraints.yaml−3
@@ -2850,7 +2850,6 @@ expected-test-failures:
2850expected-benchmark-failures:
2850expected-benchmark-failures:
2851 - Frames
2851 - Frames
2852 - attoparsec
2852 - attoparsec
2853− - bzlib-conduit
2854 - cipher-aes128
2853 - cipher-aes128
2855 - cryptohash
2854 - cryptohash
2856 - dbus
2855 - dbus
@@ -2863,9 +2862,7 @@ expected-benchmark-failures:
2863 - mongoDB
2862 - mongoDB
2864 - picoparsec
2863 - picoparsec
2865 - rethinkdb
2864 - rethinkdb
2866− - stateWriter
2867 - thyme
2865 - thyme
2868− - vinyl
2869 - warp
2866 - warp
2870 - web-routing
2867 - web-routing
2871 - xmlgen
2868 - xmlgen
debian-bootstrap.sh+11−1
@@ -99,7 +99,9 @@ apt-get install -y \
99 libyaml-dev \
99 libyaml-dev \
100 libzip-dev \
100 libzip-dev \
101 libzmq3-dev \
101 libzmq3-dev \
102+ # The LLVM version should be kept in sync with what GHC requires for its
103+ # LLVM backend (see below for more information).
102− llvm \
104+ llvm-3.7 \
103 m4 \
105 m4 \
104 nettle-dev \
106 nettle-dev \
105 nodejs \
107 nodejs \
@@ -122,3 +124,11 @@ mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc
122# faster anyways and uses less RAM.
124# faster anyways and uses less RAM.
123update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 20
125update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 20
124update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
126update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
127+
128+# GHC requires a specific LLVM version on the system PATH for its LLVM backend.
129+# This version is tracked here:
130+# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing
131+#
132+# GHC 8.0 requires LLVM 3.7 tools (specifically, llc-3.7 and opt-3.7).
133+update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-3.7" 50
134+update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-3.7" 50