diff options
| author | Ben Gamari <ben@well-typed.com> | 2022-03-21 15:28:29 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-04-06 15:18:26 -0400 |
| commit | 9934ad54dcdc00a3a236fc8cb09b1a76e7aea81e (patch) | |
| tree | 47510e5de6722caed583f4511c0bda385ca0365b /testsuite/tests/rts | |
| parent | 402c36ba403c26a3e3738405c5ad76c13d8c3ad2 (diff) | |
| download | haskell-9934ad54dcdc00a3a236fc8cb09b1a76e7aea81e.tar.gz | |
testsuite: Clean up tests depending on C++ std lib
Diffstat (limited to 'testsuite/tests/rts')
| -rw-r--r-- | testsuite/tests/rts/T10672/Makefile | 4 | ||||
| -rw-r--r-- | testsuite/tests/rts/all.T | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/testsuite/tests/rts/T10672/Makefile b/testsuite/tests/rts/T10672/Makefile index 5fc458857e..bcc9a5c22b 100644 --- a/testsuite/tests/rts/T10672/Makefile +++ b/testsuite/tests/rts/T10672/Makefile @@ -3,9 +3,9 @@ include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk T10672_x64: - '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -rtsopts=none -fforce-recomp -lgcc_s_seh-1 -lstdc++-6 \ + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -rtsopts=none -fforce-recomp -lgcc_s_seh-1 -l${LIBCXX} \ Main.hs Printf.hs cxxy.cpp T10672_x86: - '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -rtsopts=none -fforce-recomp -lgcc_s_dw2-1 -lstdc++-6 \ + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -rtsopts=none -fforce-recomp -lgcc_s_dw2-1 -${LIBCXX} \ Main.hs Printf.hs cxxy.cpp diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T index 32afacc5e8..cf0b7b2a09 100644 --- a/testsuite/tests/rts/all.T +++ b/testsuite/tests/rts/all.T @@ -474,7 +474,8 @@ test('keep-cafs', # Test proper functioning of C++ exceptions within a C++ program. # On darwin, this requires -fcompact-unwind. # When -fcompact-unwind becomes default, generalize test to all platforms. -test('T11829', unless(opsys('darwin'), skip), compile_and_run, ['T11829_c.cpp -lstdc++ -fcompact-unwind']) +test('T11829', unless(opsys('darwin'), skip), compile_and_run, + ['T11829_c.cpp -l{} -fcompact-unwind'.format(config.stdcxx_impl)]) test('T16514', normal, compile_and_run, ['T16514_c.c']) test('test-zeroongc', extra_run_opts('-DZ'), compile_and_run, ['-debug']) |