From 2bc957b038e77777e3bd5905d9da4080a45fdff0 Mon Sep 17 00:00:00 2001 From: Simon Marlow <marlowsd@gmail.com> Date: Thu, 23 Aug 2012 10:36:58 +0100 Subject: [PATCH] avoid the new -rtsopts/-shared warning --- testsuite/tests/cabal/cabal04/Makefile | 5 ++++- testsuite/tests/dynlibs/Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/testsuite/tests/cabal/cabal04/Makefile b/testsuite/tests/cabal/cabal04/Makefile index dbdf30745f51..6471b92cbee2 100644 --- a/testsuite/tests/cabal/cabal04/Makefile +++ b/testsuite/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/testsuite/tests/dynlibs/Makefile b/testsuite/tests/dynlibs/Makefile index 17931d27cd84..db328034d1b0 100644 --- a/testsuite/tests/dynlibs/Makefile +++ b/testsuite/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 -- GitLab