Better handling of scons -u targets.
--HG-- extra : convert_revision : 7bf0688a1c83d8385b77a59a1c75040e9624c0ae
This commit is contained in:
parent
6b9903f426
commit
51e3688701
1 changed files with 13 additions and 7 deletions
20
SConstruct
20
SConstruct
|
@ -106,13 +106,6 @@ sys.path.append(joinpath(ROOT, 'src/python'))
|
||||||
# Find default configuration & binary.
|
# Find default configuration & binary.
|
||||||
Default(os.environ.get('M5_DEFAULT_BINARY', 'build/ALPHA_SE/m5.debug'))
|
Default(os.environ.get('M5_DEFAULT_BINARY', 'build/ALPHA_SE/m5.debug'))
|
||||||
|
|
||||||
# Ask SCons which directory it was invoked from.
|
|
||||||
launch_dir = GetLaunchDir()
|
|
||||||
|
|
||||||
# Make targets relative to invocation directory
|
|
||||||
abs_targets = map(lambda x: os.path.normpath(joinpath(launch_dir, str(x))),
|
|
||||||
BUILD_TARGETS)
|
|
||||||
|
|
||||||
# helper function: find last occurrence of element in list
|
# helper function: find last occurrence of element in list
|
||||||
def rfind(l, elt, offs = -1):
|
def rfind(l, elt, offs = -1):
|
||||||
for i in range(len(l)+offs, 0, -1):
|
for i in range(len(l)+offs, 0, -1):
|
||||||
|
@ -142,6 +135,19 @@ def compare_versions(v1, v2):
|
||||||
# recognize that ALPHA_SE specifies the configuration because it
|
# recognize that ALPHA_SE specifies the configuration because it
|
||||||
# follow 'build' in the bulid path.
|
# follow 'build' in the bulid path.
|
||||||
|
|
||||||
|
# Generate absolute paths to targets so we can see where the build dir is
|
||||||
|
if COMMAND_LINE_TARGETS:
|
||||||
|
# Ask SCons which directory it was invoked from
|
||||||
|
launch_dir = GetLaunchDir()
|
||||||
|
# Make targets relative to invocation directory
|
||||||
|
abs_targets = map(lambda x: os.path.normpath(joinpath(launch_dir, str(x))),
|
||||||
|
COMMAND_LINE_TARGETS)
|
||||||
|
else:
|
||||||
|
# Default targets are relative to root of tree
|
||||||
|
abs_targets = map(lambda x: os.path.normpath(joinpath(ROOT, str(x))),
|
||||||
|
DEFAULT_TARGETS)
|
||||||
|
|
||||||
|
|
||||||
# Generate a list of the unique build roots and configs that the
|
# Generate a list of the unique build roots and configs that the
|
||||||
# collected targets reference.
|
# collected targets reference.
|
||||||
build_paths = []
|
build_paths = []
|
||||||
|
|
Loading…
Reference in a new issue