Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/0a0cfe0549800d5ba6b7b5ca19b8d4ce04fbfce1 >--------------------------------------------------------------- commit 0a0cfe0549800d5ba6b7b5ca19b8d4ce04fbfce1 Author: Simon Marlow <[email protected]> Date: Thu Aug 23 10:36:58 2012 +0100 avoid the new -rtsopts/-shared warning >--------------------------------------------------------------- tests/cabal/cabal04/Makefile | 5 ++++- tests/dynlibs/Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/cabal/cabal04/Makefile b/tests/cabal/cabal04/Makefile index dbdf307..6471b92 100644 --- a/tests/cabal/cabal04/Makefile +++ b/tests/cabal/cabal04/Makefile @@ -7,11 +7,14 @@ SETUP=./Setup -v0 # This tests that we can build a Cabal package that uses TH with both # profiling and dynamic linking. (#3604) +# omitting -rtsopts from --ghc-options avoids a warning from GHC when +# building the shared library (-rtsopts has no effect with -shared) + cabal04: $(MAKE) clean '$(TEST_HC)' -v0 --make Setup $(SETUP) clean - $(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' $(PROF) $(DYN) + $(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(filter-out -rtsopts,$(TEST_HC_OPTS))' $(PROF) $(DYN) $(SETUP) build 2> err ! grep -v "Creating library file" err ifneq "$(CLEANUP)" "" diff --git a/tests/dynlibs/Makefile b/tests/dynlibs/Makefile index 17931d2..db32803 100644 --- a/tests/dynlibs/Makefile +++ b/tests/dynlibs/Makefile @@ -9,7 +9,7 @@ T3807: $(RM) T3807-export.o T3807-load.o $(RM) T3807test.so $(RM) T3807-load - '$(TEST_HC)' $(filter-out -rtsopts,$(TEST_HC_OPTS)) -v0 --make -dynamic -fPIC -shared T3807Export.hs T3807-export.c -o T3807test.so -lHSrts-ghc`'$(TEST_HC)' $(TEST_HC_OPTS) --numeric-version` -rtsopts + '$(TEST_HC)' $(filter-out -rtsopts,$(TEST_HC_OPTS)) -v0 --make -dynamic -fPIC -shared T3807Export.hs T3807-export.c -o T3807test.so -lHSrts-ghc`'$(TEST_HC)' $(TEST_HC_OPTS) --numeric-version` '$(TEST_HC)' $(filter-out -rtsopts,$(TEST_HC_OPTS)) -no-auto-link-packages -no-hs-main T3807-load.c -o T3807-load -ldl ./T3807-load _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
