Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/fa17532b1dee0c957a9a110cbaad72b588fdb454

>---------------------------------------------------------------

commit fa17532b1dee0c957a9a110cbaad72b588fdb454
Author: Simon Marlow <[email protected]>
Date:   Mon Apr 30 11:25:57 2012 +0100

    fix T4464 on Windows

>---------------------------------------------------------------

 tests/dynlibs/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/dynlibs/Makefile b/tests/dynlibs/Makefile
index 6d4f736..17931d2 100644
--- a/tests/dynlibs/Makefile
+++ b/tests/dynlibs/Makefile
@@ -19,7 +19,7 @@ T4464:
        $(RM) T4464H_stub.c T4464H_stub.h T4464H_stub.o
        $(RM) HS4464.dll HS4464.dll.a t4464.exe
        '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -shared T4464H.hs T4464B.c 
-optc-DRTSOPTS=RtsOptsSafeOnly -o HS4464.dll
-       '$(TEST_HC)' $(TEST_HC_OPTS) -v0 T4464C.c HS4464.dll.a -o t4464.exe 
-no-hs-main
+       '$(TEST_HC)' $(filter-out -rtsopts,$(TEST_HC_OPTS)) -v0 T4464C.c 
HS4464.dll.a -o t4464.exe -no-hs-main
        -./t4464.exe
        echo "====="
        echo "=====" >&2
@@ -27,7 +27,7 @@ T4464:
        $(RM) T4464H_stub.c T4464H_stub.h T4464H_stub.o
        $(RM) HS4464.dll HS4464.dll.a t4464.exe
        '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -shared T4464H.hs T4464B.c  
-optc-DRTSOPTS=RtsOptsAll -o HS4464.dll
-       '$(TEST_HC)' $(TEST_HC_OPTS) -v0 T4464C.c HS4464.dll.a -o t4464.exe 
-no-hs-main
+       '$(TEST_HC)' $(filter-out -rtsopts,$(TEST_HC_OPTS)) -v0 T4464C.c 
HS4464.dll.a -o t4464.exe -no-hs-main
        ./t4464.exe
 
 .PHONY: T5373



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to