diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-03-07 20:01:34 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-03-07 20:01:34 -0500 |
| commit | 97c4a84985b0f9168f60f28d5cc96be448eef4fa (patch) | |
| tree | 5d385f2410979c4b4b2164686c87b8a083ad108d /build/SConstruct | |
| parent | 11aead894d4186916b587b1449075f276319a235 (diff) | |
| parent | ab67095b2a43b5f2d44d1e1a517d1079ddf9f104 (diff) | |
| download | gem5-97c4a84985b0f9168f60f28d5cc96be448eef4fa.tar.xz | |
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc
arch/alpha/faults.cc:
Hand merge.
--HG--
rename : arch/alpha/linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/tru64_process.cc => arch/alpha/tru64/process.cc
extra : convert_revision : 6ea1fae5be0ebd02eff330423d16da63b790516d
Diffstat (limited to 'build/SConstruct')
| -rw-r--r-- | build/SConstruct | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/SConstruct b/build/SConstruct index 2d64afb3e..306d3a9dc 100644 --- a/build/SConstruct +++ b/build/SConstruct @@ -341,11 +341,11 @@ for build_dir in build_dirs: sticky_opts.files = [] # 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', + default_options_file = os.path.join('default_options', 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) + current_options_file = os.path.join('options', build_dir) if os.path.isfile(current_options_file): sticky_opts.files.append(current_options_file) else: @@ -355,7 +355,7 @@ for build_dir in build_dirs: if not os.path.isdir(opt_dir): os.mkdir(opt_dir) if not sticky_opts.files: - print "%s: No options file found in build_options, using defaults." \ + print "%s: No options file found in options, using defaults." \ % build_dir # Apply current option settings to env |