diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-10-06 22:56:57 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-10-06 22:56:57 +0100 |
| commit | 8ae3201119e99071f2abeb606d6dfab24efded0f (patch) | |
| tree | 2ac46690e923ebfd5c3bbbc35cddcce82cd2de96 /testsuite/tests/dynlibs | |
| parent | 81c3b7167313604fb639ddbc4d0a83e1e3448d11 (diff) | |
| download | haskell-8ae3201119e99071f2abeb606d6dfab24efded0f.tar.gz | |
Fix #4264 on OS X
We were getting the RTS linked twice, which caused odd things to happen.
Diffstat (limited to 'testsuite/tests/dynlibs')
| -rw-r--r-- | testsuite/tests/dynlibs/Makefile | 2 | ||||
| -rw-r--r-- | testsuite/tests/dynlibs/all.T | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/testsuite/tests/dynlibs/Makefile b/testsuite/tests/dynlibs/Makefile index b746326062..d0efb6ef3b 100644 --- a/testsuite/tests/dynlibs/Makefile +++ b/testsuite/tests/dynlibs/Makefile @@ -10,7 +10,7 @@ T3807: $(RM) T3807test.so $(RM) T3807-load '$(TEST_HC)' $(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)' $(TEST_HC_OPTS) T3807-load.c -o T3807-load -ldl + '$(TEST_HC)' $(TEST_HC_OPTS) -no-auto-link-packages -no-hs-main T3807-load.c -o T3807-load -ldl ./T3807-load .PHONY: T4464 diff --git a/testsuite/tests/dynlibs/all.T b/testsuite/tests/dynlibs/all.T index 2ed477255b..dd1c20fc50 100644 --- a/testsuite/tests/dynlibs/all.T +++ b/testsuite/tests/dynlibs/all.T @@ -6,8 +6,7 @@ test('T3807', 'T3807-export.o', 'T3807-load.o', 'T3807test.so', 'T3807-load']), - if_os('mingw32', skip), - if_os('darwin', expect_broken(4264))], + if_os('mingw32', skip)], run_command, ['$MAKE --no-print-directory -s T3807']) |