diff options
| -rw-r--r-- | testsuite/tests/rts/T11223/Makefile | 4 | ||||
| -rw-r--r-- | testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/rts/T11223/foo2.hs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/tests/rts/T11223/Makefile b/testsuite/tests/rts/T11223/Makefile index 6ffe7cba3e..6bcb9a5f39 100644 --- a/testsuite/tests/rts/T11223/Makefile +++ b/testsuite/tests/rts/T11223/Makefile @@ -34,7 +34,7 @@ t_11223_simple_duplicate_lib: "$(CC)" -c foo.c -o foo_dup_lib.o "$(CC)" -c bar.c -o bar_dup_lib.o "$(AR)" rs libfoo_dup_lib.a foo_dup_lib.o 2> /dev/null - echo main | "$(TEST_HC)" --interactive -v0 $(filter-out -rtsopts, $(TEST_HC_OPTS)) -ignore-dot-ghci bar_dup.o foo.hs -lfoo_dup_lib -L"$(PWD)" + echo main | "$(TEST_HC)" --interactive -v0 $(filter-out -rtsopts, $(TEST_HC_OPTS)) -ignore-dot-ghci bar_dup_lib.o foo.hs -lfoo_dup_lib -L"$(PWD)" .PHONY: t_11223_simple_unused_duplicate_lib t_11223_simple_unused_duplicate_lib: @@ -42,7 +42,7 @@ t_11223_simple_unused_duplicate_lib: "$(CC)" -c foo.c -o foo_dup_lib.o "$(CC)" -c bar.c -o bar_dup_lib.o "$(AR)" rs libbar_dup_lib.a bar_dup_lib.o 2> /dev/null - echo main | "$(TEST_HC)" --interactive -v0 $(filter-out -rtsopts, $(TEST_HC_OPTS)) -ignore-dot-ghci foo_dup.o foo.hs -lbar_dup_lib -L"$(PWD)" + echo main | "$(TEST_HC)" --interactive -v0 $(filter-out -rtsopts, $(TEST_HC_OPTS)) -ignore-dot-ghci foo_dup_lib.o foo.hs -lbar_dup_lib -L"$(PWD)" .PHONY: t_11223_link_order_a_b_succeed t_11223_link_order_a_b_succeed: diff --git a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr index 06da96ff27..0785cdc6eb 100644 --- a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr +++ b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr @@ -3,7 +3,7 @@ GHC runtime linker: fatal error: I found a duplicate definition for symbol whilst processing object file /home/phyx/Documents/ghc/testsuite/tests/rts/T11223/libfoo_dup_lib.a The symbol was previously defined in - bar_dup.o + bar_dup_lib.o This could be caused by: * Loading two different object files which export the same symbol * Specifying the same object file twice on the GHCi command line diff --git a/testsuite/tests/rts/T11223/foo2.hs b/testsuite/tests/rts/T11223/foo2.hs index ecaed41282..1c9ebce024 100644 --- a/testsuite/tests/rts/T11223/foo2.hs +++ b/testsuite/tests/rts/T11223/foo2.hs @@ -1,5 +1,5 @@ module Main where -foreign import ccall "a" c_exp :: Int +foreign import ccall "a" a_exp :: Int -main = print c_exp +main = print a_exp |