summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Glushenkov <mikhail.glushenkov@gmail.com>2014-03-04 08:02:36 +0100
committerAustin Seipp <austin@well-typed.com>2014-03-22 14:39:41 -0500
commitbe2e0e88d7ddd33eef8277c8d67f0b0f3e2874be (patch)
tree5700b156d5d5a3848a6414dfab0153afafee2ee9
parent16d04d902d4720b3137e07a503fbf72c90b9e164 (diff)
downloadhaskell-be2e0e88d7ddd33eef8277c8d67f0b0f3e2874be.tar.gz
Make cabal01 pass with Cabal 1.18 (#8738).
Signed-off-by: Austin Seipp <austin@well-typed.com>
-rw-r--r--testsuite/tests/cabal/cabal01/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/testsuite/tests/cabal/cabal01/Makefile b/testsuite/tests/cabal/cabal01/Makefile
index b18d8fc3a1..f1b74b4c68 100644
--- a/testsuite/tests/cabal/cabal01/Makefile
+++ b/testsuite/tests/cabal/cabal01/Makefile
@@ -28,7 +28,7 @@ cabal01:
# we get a warning if dynlibs are enabled by default that:
# Warning: -rtsopts and -with-rtsopts have no effect with -shared.
# so we filter the flag out
- ./setup configure -v0 --prefix=$(PREFIX) --with-compiler='$(TEST_HC)' --ghc-options='$(filter-out -rtsopts,$(TEST_HC_OPTS))' --with-hc-pkg='$(GHC_PKG)' --package-db=local.db $(VANILLA) $(PROF) $(DYN)
+ ./setup configure -v0 --prefix=$(PREFIX) --with-compiler='$(TEST_HC)' --ghc-options='$(filter-out -rtsopts,$(TEST_HC_OPTS))' --with-hc-pkg='$(GHC_PKG)' --package-db=local.db $(VANILLA) $(PROF) $(DYN) --libsubdir='$$pkgid'
./setup build -v0
./setup copy -v0
echo install1:
@@ -42,4 +42,3 @@ cabal01:
echo dist:
ls -1 dist
if [ "$(CLEANUP)" != "" ]; then $(MAKE) clean; fi
-