diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2005-08-31 00:19:37 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2005-08-31 00:19:37 -0400 |
| commit | 919aa6dd0065d3c7992a7984469a3ef856b9a128 (patch) | |
| tree | 51cc9e8db49dcccf298edf294d5d07e95c33a0d5 /build/SConstruct | |
| parent | 284e3e9c46cfabeddb30cbbbe49952972ffd055e (diff) | |
| download | gem5-919aa6dd0065d3c7992a7984469a3ef856b9a128.tar.xz | |
Move options files from <build_dir>/build_options to build_options/<build_dir>.
build/SConstruct:
Move options file from <build_dir>/build_options to build_options/<build_dir>.
--HG--
extra : convert_revision : 0363f79ef5c9c157d9018fcae9c5e055e38e552d
Diffstat (limited to 'build/SConstruct')
| -rw-r--r-- | build/SConstruct | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/build/SConstruct b/build/SConstruct index f30014154..2aac28379 100644 --- a/build/SConstruct +++ b/build/SConstruct @@ -146,12 +146,6 @@ for t in my_targets: if dir not in build_dirs: build_dirs.append(dir) -# Make a first pass to verify that build dirs are valid -for build_dir in build_dirs: - if not os.path.isdir(build_dir): - print "Error: build directory", build_dir, "does not exist." - Exit(1) - ################################################### # # Set up the default build environment. This environment is copied @@ -256,7 +250,9 @@ for build_dir in build_dirs: # Make a copy of the default environment to use for this config. env = base_env.Copy() # Set env according to the build directory config. - options_file = os.path.join(build_dir, 'build_options') + options_file = os.path.join('build_options', build_dir) + if not os.path.isfile(options_file): + print "Options file %s not found, using defaults." % options_file opts = Options(options_file, ARGUMENTS) opts.AddOptions( EnumOption('TARGET_ISA', 'Target ISA', 'alpha', ('alpha')), |