sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scons: allow use of current builds as default build settings

Browse source 
Currently the --default= option only looks at the predefined
build configs (in m5/build_opts), so you're limited to basing
a new build config off of those (ALPHA_SE, etc.).  If you've
already defined a non-standard build config and want to clone
it or tweak it, you have to start from scratch.  This patch
causes --default= to look first among the existing builds
(in build/variables) before looking in build_opts so you
can specify an existing non-standard build config as a
starting point for a new config.
This commit is contained in:
Steve Reinhardt 2011-05-02 12:40:31 -07:00
parent dd95bc4d44
commit f713af951a
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
SConstruct
View file

@ -967,18 +967,24 @@ for variant_path in variant_paths:
# Get default build variables from source tree. Variables are # Get default build variables from source tree. Variables are
# normally determined by name of $VARIANT_DIR, but can be # normally determined by name of $VARIANT_DIR, but can be
# overriden by 'default=' arg on command line. # overridden by '--default=' arg on command line.
default = GetOption('default') default = GetOption('default')
if not default: opts_dir = joinpath(main.root.abspath, 'build_opts')
default = variant_dir if default:
default_vars_file = joinpath('build_opts', default) default_vars_files = [joinpath(build_root, 'variables', default),
if isfile(default_vars_file): joinpath(opts_dir, default)]
else:
default_vars_files = [joinpath(opts_dir, variant_dir)]
existing_files = filter(isfile, default_vars_files)
if existing_files:
default_vars_file = existing_files[0]
sticky_vars.files.append(default_vars_file) sticky_vars.files.append(default_vars_file)
print "Variables file %s not found,\n using defaults in %s" \ print "Variables file %s not found,\n using defaults in %s" \
% (current_vars_file, default_vars_file) % (current_vars_file, default_vars_file)
else: else:
print "Error: cannot find variables file %s or %s" \ print "Error: cannot find variables file %s or " \
% (current_vars_file, default_vars_file) "default file(s) %s" \
% (current_vars_file, ' or '.join(default_vars_files))
Exit(1) Exit(1)
# Apply current variable settings to env # Apply current variable settings to env