diff options
| -rw-r--r-- | build/SConstruct | 10 | ||||
| -rw-r--r-- | build/build_options/ALPHA_FS | 7 | ||||
| -rw-r--r-- | build/build_options/ALPHA_FS_TL | 7 | ||||
| -rw-r--r-- | build/build_options/ALPHA_SE | 7 |
4 files changed, 24 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')), diff --git a/build/build_options/ALPHA_FS b/build/build_options/ALPHA_FS new file mode 100644 index 000000000..11c08ae25 --- /dev/null +++ b/build/build_options/ALPHA_FS @@ -0,0 +1,7 @@ +FULL_SYSTEM = 1 +ALPHA_TLASER = 0 +NO_FAST_ALLOC = 0 +EFENCE = 0 +SS_COMPATIBLE_FP = 0 +STATS_BINNING = 1 +USE_MYSQL = 1 diff --git a/build/build_options/ALPHA_FS_TL b/build/build_options/ALPHA_FS_TL new file mode 100644 index 000000000..59436f858 --- /dev/null +++ b/build/build_options/ALPHA_FS_TL @@ -0,0 +1,7 @@ +FULL_SYSTEM = 1 +ALPHA_TLASER = 1 +NO_FAST_ALLOC = 0 +EFENCE = 0 +SS_COMPATIBLE_FP = 0 +STATS_BINNING = 1 +USE_MYSQL = 1 diff --git a/build/build_options/ALPHA_SE b/build/build_options/ALPHA_SE new file mode 100644 index 000000000..810c641f6 --- /dev/null +++ b/build/build_options/ALPHA_SE @@ -0,0 +1,7 @@ +FULL_SYSTEM = 0 +ALPHA_TLASER = 0 +NO_FAST_ALLOC = 0 +EFENCE = 0 +SS_COMPATIBLE_FP = 1 +STATS_BINNING = 1 +USE_MYSQL = 1 |