Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #12799: Enable elf symbol patching for Haiku

Browse Source 
Signed-off-by: Jérôme Duval <jerome.duval@gmail.com>
This commit is contained in:
Mark Hellegers 2016-05-28 19:47:00 +00:00 committed by Jérôme Duval
parent a034dfb647
commit 65f5e1e1b2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
headers/tools/cppunit/TestShell.h
View File

@ -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

6
src/tools/cppunit/Jamfile
View File

@ -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.

4
src/tools/cppunit/TestShell.cpp
View File

@ -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;