Split libelf/SConscript into two parts, one for the
shared build and one for the per-config header file copying. SConscript: Just include libelf/SConscript-local. build/SConstruct: Include libelf/SConscript-global. --HG-- extra : convert_revision : 0a4ae8f1514819f99fec101b898c19dabd4d59bd
This commit is contained in:
parent
2eed802774
commit
2c5356835d
2 changed files with 10 additions and 1 deletions
|
@ -420,7 +420,9 @@ env.Command('targetarch', None, link_targetarch)
|
||||||
|
|
||||||
|
|
||||||
# libelf build is described in its own SConscript file.
|
# libelf build is described in its own SConscript file.
|
||||||
SConscript('libelf/SConscript', exports = 'env', duplicate=0)
|
# 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('sim/pyconfig/SConscript', exports = ['env', 'obj_desc_files'],
|
SConscript('sim/pyconfig/SConscript', exports = ['env', 'obj_desc_files'],
|
||||||
duplicate=0)
|
duplicate=0)
|
||||||
|
|
|
@ -246,6 +246,13 @@ 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". SConscript-global is the build in
|
||||||
|
# build/libelf shared among all configs.
|
||||||
|
default_env.SConscript('m5/libelf/SConscript-global',
|
||||||
|
exports={'env' : default_env})
|
||||||
|
|
||||||
###################################################
|
###################################################
|
||||||
#
|
#
|
||||||
# Define build environments for selected configurations.
|
# Define build environments for selected configurations.
|
||||||
|
|
Loading…
Reference in a new issue