Fix #12799: Enable elf symbol patching for Haiku

Signed-off-by: Jérôme Duval <[email protected]>

headers/tools/cppunit/TestShell.h

@@ -17,7 +17,11 @@ class BDirectory;
 class BLocker;
 class BPath;
 
+#ifndef NO_ELF_SYMBOL_PATCHING
+#include <tools/elfsymbolpatcher/ElfSymbolPatcher.h>
+#else
 class ElfSymbolPatchGroup;
+#endif
 
 // Defines SuiteFunction to be a pointer to a function that
 // takes no arguments and returns a pointer to a CppUnit::Test

src/tools/cppunit/Jamfile

@@ -11,7 +11,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) cppunit ] ;
 {
 	DEFINES += BUILDING_CPPUNIT ;
 
-	if $(OS) != BEOS || $(OSPLAT) = PPC {
+	if ( $(OS) != BEOS && $(OS) != HAIKU ) || $(OSPLAT) = PPC {
 		DEFINES += NO_ELF_SYMBOL_PATCHING ;
 	}
 }
@@ -52,8 +52,8 @@ SharedLibrary libcppunit.so :
 	: be [ TargetLibstdc++ ]
 ;
 
-if  $(OS) = BEOS && $(OSPLAT) != PPC {
-	LinkAgainst libcppunit.so : libelfsymbolpatcher.a ;
+if  ( $(OS) = BEOS || $(OS) = HAIKU ) && $(OSPLAT) != PPC {
+	LinkAgainst libcppunit.so : libelfsymbolpatcher.a debug ;
 }
 
 # To run the tests we need the cppunit library.

src/tools/cppunit/TestShell.cpp

@@ -22,10 +22,6 @@
 #include <TestShell.h>
 #include <TestListener.h>
 
-#ifndef NO_ELF_SYMBOL_PATCHING
-#	include <ElfSymbolPatcher.h>
-#endif
-
 using std::cout;
 using std::endl;
 using std::set;