summaryrefslogtreecommitdiff
path: root/testsuite/tests/cabal/cabal01
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2012-10-04 10:06:19 +0100
committerIan Lynagh <ian@well-typed.com>2012-10-04 10:06:19 +0100
commit26ab06c55f547af6052bdef467ce90f62a05a065 (patch)
treee914c9ce67a06b7fb1151f3cfe227cf118e2472a /testsuite/tests/cabal/cabal01
parent516259e93024db6c4dc214f559666817fe114843 (diff)
downloadhaskell-26ab06c55f547af6052bdef467ce90f62a05a065.tar.gz
Fix a couple of tests when dynlibs-by-default is on
Diffstat (limited to 'testsuite/tests/cabal/cabal01')
-rw-r--r--testsuite/tests/cabal/cabal01/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/testsuite/tests/cabal/cabal01/Makefile b/testsuite/tests/cabal/cabal01/Makefile
index 5217d89cc1..b88756a4ed 100644
--- a/testsuite/tests/cabal/cabal01/Makefile
+++ b/testsuite/tests/cabal/cabal01/Makefile
@@ -24,7 +24,11 @@ cabal01:
'$(TEST_HC)' --make -o setup Setup.lhs -v0
'$(GHC_PKG)' init local.db
- ./setup configure -v0 --prefix=$(PREFIX) --with-compiler='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --with-hc-pkg='$(GHC_PKG)' --package-db=local.db $(PROF)
+# We don't make use of -rtsopts in this test, and if it's enabled then
+# 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 $(PROF)
./setup build -v0
./setup copy -v0
echo install1: