From e9394721903222eee0dd17799e97ea06ea545f39 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Sat, 1 Oct 2005 11:32:33 -0400 Subject: Add default= option to SConstruct. build/SConstruct: Add 'default=' argument to specify base config to use when setting up a new build dir with a different name, e.g.: scons default=ALPHA_SE USE_MYSQL=no ALPHA_SE_NOSQL/m5.opt --HG-- extra : convert_revision : 0f7ee1414b3e84b36114415182baf54a8adab9b7 --- build/SConstruct | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'build/SConstruct') diff --git a/build/SConstruct b/build/SConstruct index e7ec87a53..2d5ca0057 100644 --- a/build/SConstruct +++ b/build/SConstruct @@ -322,7 +322,10 @@ for build_dir in build_dirs: # Set env according to the build directory config. sticky_opts.files = [] - default_options_file = os.path.join('build_options', 'default', build_dir) + # Name of default options file is taken from 'default=' on command + # line if set, otherwise name of build dir. + default_options_file = os.path.join('build_options', 'default', + ARGUMENTS.get('default', build_dir)) if os.path.isfile(default_options_file): sticky_opts.files.append(default_options_file) current_options_file = os.path.join('build_options', 'current', build_dir) -- cgit v1.2.3