Fix T7037 on Win64

pbogdan · Feb 5, 2013 · 4bde383 · 4bde383
1 parent 5527c5b
commit 4bde383
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile
@@ -48,11 +48,16 @@ T5423:
 T6006_setup :
 	'$(TEST_HC)' $(TEST_HC_OPTS) -c T6006.hs
 
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+T7037_CONST = const
+else
+T7037_CONST =
+endif
 .PHONY: T7037
 T7037:
 	$(RM) 7037.o 7037.hi 7037$(exeext)
 	"$(TEST_HC)" $(TEST_HC_OPTS) T7037.hs -v0
-	"$(TEST_HC)" $(filter-out -rtsopts, $(TEST_HC_OPTS)) T7037_main.c -v0 -o T7037_main -no-hs-main
+	"$(TEST_HC)" -optc-DT7037_CONST=$(T7037_CONST) $(filter-out -rtsopts, $(TEST_HC_OPTS)) T7037_main.c -v0 -o T7037_main -no-hs-main
 	./T7037_main
 
 T7040_ghci_setup :

diff --git a/testsuite/tests/rts/T7037_main.c b/testsuite/tests/rts/T7037_main.c
@@ -2,9 +2,6 @@
 #include <unistd.h>
 
 int main(int argc, char *argv[]) {
-#ifdef __MINGW32__
-    const
-#endif
-    char * args[2] = {"T7037", NULL};
+    T7037_CONST char * args[2] = {"T7037", NULL};
     execv("./T7037", args);
 }