Move libelf/SConscript include to m5/SConscript, so elf
headers get created in build tree (under build/FOO/libelf) instead of source tree (m5/libelf). SConscript: Move libelf/SConscript include here. build/SConstruct: Get rid of libelf/SConscript include (moved to m5/SConscript). --HG-- extra : convert_revision : c0acb3bab2afa5079748b907c5917f548582099e
This commit is contained in:
parent
e79dee27ce
commit
1939370c96
2 changed files with 5 additions and 6 deletions
|
@ -337,6 +337,11 @@ def link_targetarch(target, source, env):
|
||||||
env.Command('targetarch', None, link_targetarch)
|
env.Command('targetarch', None, link_targetarch)
|
||||||
|
|
||||||
|
|
||||||
|
# libelf build is described in its own SConscript file.
|
||||||
|
SConscript('libelf/SConscript', exports = 'env',
|
||||||
|
duplicate=0)
|
||||||
|
|
||||||
|
|
||||||
# This function adds the specified sources to the given build
|
# This function adds the specified sources to the given build
|
||||||
# environment, and returns a list of all the corresponding SCons
|
# environment, and returns a list of all the corresponding SCons
|
||||||
# Object nodes (including an extra one for date.cc). We explicitly
|
# Object nodes (including an extra one for date.cc). We explicitly
|
||||||
|
|
|
@ -246,12 +246,6 @@ default_env.Append(CCFLAGS='-pipe')
|
||||||
default_env.Append(CCFLAGS='-fno-strict-aliasing')
|
default_env.Append(CCFLAGS='-fno-strict-aliasing')
|
||||||
default_env.Append(CCFLAGS=Split('-Wall -Wno-sign-compare -Werror -Wundef'))
|
default_env.Append(CCFLAGS=Split('-Wall -Wno-sign-compare -Werror -Wundef'))
|
||||||
|
|
||||||
# libelf build is described in its own SConscript file. Using a
|
|
||||||
# dictionary for exports lets us export "default_env" so the
|
|
||||||
# SConscript will see it as "env".
|
|
||||||
default_env.SConscript('m5/libelf/SConscript', exports={'env' : default_env})
|
|
||||||
|
|
||||||
|
|
||||||
###################################################
|
###################################################
|
||||||
#
|
#
|
||||||
# Define build environments for selected configurations.
|
# Define build environments for selected configurations.
|
||||||
|
|
Loading…
Reference in a new issue