From 09ecf1bd8b9f88aff8f1d5d59746d917051671ef Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 30 Aug 2011 16:51:09 +0000 Subject: [PATCH] contrib: rebuild the Win32 CppUnit under Linux and fix the includes. Apparently g++ 4.5.2 on native mingw32 inserts references to __Unwind_Resume when exceptions are supported. This function is not present in the g++ 4.4 cross-compiler found in Debian, leading to linker errors when cross- compiling. So we use the latter to build CppUnit itself. Another problem arises with g++ 4.4, which is the incomplete stripping of exceptions when -fno-exceptions is used. Since ExceptionTestCaseDecorator.h has such code, we protect it with #ifdef __EXCEPTIONS in the meantime. --- test/lol-bench.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/lol-bench.cpp b/test/lol-bench.cpp index 5f95fd19..c647cb14 100644 --- a/test/lol-bench.cpp +++ b/test/lol-bench.cpp @@ -137,9 +137,6 @@ static void bench_half(int mode) ph[i] = RandF(-2.0f, 2.0f); break; } -#if defined __EXCEPTIONS -#error lol -#endif /* Copy float */ timer.GetMs();