diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-26 18:40:08 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-26 18:40:08 -0400 |
commit | 5df77b865ddc29a00629a679437dee2578997559 (patch) | |
tree | 57f7c93f29e8787b42e7399182c12a8b933ef193 /src/SConscript | |
parent | e04f60667af9884fa871935e4c1274bdf0311707 (diff) | |
parent | 53510f184452c46868a9e6ece9ccb7f30ab70843 (diff) | |
download | gem5-5df77b865ddc29a00629a679437dee2578997559.tar.xz |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 3a34dbab3101281786a4b70724c5aee3e4730843
Diffstat (limited to 'src/SConscript')
-rw-r--r-- | src/SConscript | 5 |
1 files changed, 0 insertions, 5 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') |