diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/SConscript | 5 | ||||
| -rw-r--r-- | src/base/loader/elf_object.cc | 8 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/SConscript b/src/SConscript index a2d5de279..558c447e9 100644 --- a/src/SConscript +++ b/src/SConscript @@ -326,10 +326,6 @@ env.Command(Split('base/traceflags.hh base/traceflags.cc'), 'base/traceflags.py', 'python $SOURCE $TARGET.base') -# libelf build is described in its own SConscript file. -# SConscript-local is the per-config build, which just copies some -# header files into a place where they can be found. -SConscript('libelf/SConscript-local', exports = 'env', duplicate=0) SConscript('python/SConscript', exports = ['env'], duplicate=0) # This function adds the specified sources to the given build @@ -358,7 +354,6 @@ def make_objs(sources, env): # the corresponding build directory to pick up generated include # files. env.Append(CPPPATH='.') -env.Append(CPPPATH='./libelf') # Debug binary debugEnv = env.Copy(OBJSUFFIX='.do') diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc index 165501e1c..79601e9d1 100644 --- a/src/base/loader/elf_object.cc +++ b/src/base/loader/elf_object.cc @@ -30,16 +30,10 @@ // Because of the -Wundef flag we have to do this #define __LIBELF_INTERNAL__ 0 -// counterintuitive, but the flag below causes libelf to define -// 64-bit elf types that apparently didn't exist in some older -// versions of Linux. They seem to be there in 2.4.x, so don't -// set this now (it causes things to break on 64-bit platforms). -#define __LIBELF64_LINUX 0 #define __LIBELF_NEED_LINK_H 0 #define __LIBELF_SYMBOL_VERSIONS 0 -#include "libelf/libelf.h" -#include "libelf/gelf.h" +#include "gelf.h" #include "base/loader/elf_object.hh" #include "base/misc.hh" |