@@ -24,7 +24,7 @@ GHC_PRIME_VER="8.10"
2424JOBS=1
2525
2626# Without cabal project file, it will not run any tests
27−# XXX Added DISABLE_SDIST_BUILD because of a cabal issue
27+# XXX Added DISABLE_SDIST_BUILD because of a cabal issue, need to remove it
2828ghc_prime_dist () {
2929 nix-shell \
3030 --argstr compiler "$GHC_PRIME_NIX" \
@@ -38,6 +38,7 @@ ghc_prime_dist () {
3838}
3939
4040# With cabal.project file, it will run the tests
41+# XXX Added DISABLE_SDIST_BUILD because of a cabal issue, need to remove it
4142ghc_prime_dist_tests () {
4243 nix-shell \
4344 --argstr compiler "$GHC_PRIME_NIX" \
@@ -47,6 +48,7 @@ ghc_prime_dist_tests () {
4748 CABAL_BUILD_OPTIONS=\"$CABAL_BUILD_OPTIONS --jobs=$JOBS\" \
4849 CABAL_PROJECT=cabal.project \
4950 CABAL_DISABLE_DEPS=y \
51+ DISABLE_SDIST_BUILD=y \
5052 CABAL_CHECK_RELAX=y"
5153}
5254
@@ -113,8 +115,7 @@ ghc_prime_Werror () {
113115ghc_prime_doctests () {
114116 nix-shell \
115117 --argstr compiler "$GHC_PRIME_NIX" \
116− --run "cabal build $CABAL_BUILD_OPTIONS --jobs=$JOBS --project-file cabal.project.doctest all"
117− cabal-docspec --timeout 60
118+ --run "cabal build $CABAL_BUILD_OPTIONS --jobs=$JOBS --project-file cabal.project.doctest all && cabal-docspec --timeout 60"
118119}
119120
120121#------------------------------------------------------------------------------
@@ -181,7 +182,7 @@ ghc () {
181182 --run "\
182183 packcheck.sh cabal-v2 \
183184 GHCVER=$2 \
184− CABAL_BUILD_OPTIONS="$CABAL_BUILD_OPTIONS --jobs=$JOBS" \
185+ CABAL_BUILD_OPTIONS=\"$CABAL_BUILD_OPTIONS --jobs=$JOBS\" \
185186 CABAL_DISABLE_DEPS=y \
186187 CABAL_CHECK_RELAX=y \
187188 DISABLE_SDIST_BUILD=y \