diff options
author | Nathan Binkert <binkertn@umich.edu> | 2007-04-12 09:07:59 -0700 |
---|---|---|
committer | Nathan Binkert <binkertn@umich.edu> | 2007-04-12 09:07:59 -0700 |
commit | eefbda7f7c54735791dab70626a40a7d29aa8a80 (patch) | |
tree | a3f8107580d607ee95ad9b166136ac77e386f99f | |
parent | e04208f046237c74a2350d98a74a2fdc0ad838fa (diff) | |
download | gem5-eefbda7f7c54735791dab70626a40a7d29aa8a80.tar.xz |
Don't allow Source to accept multiple arguments, lists,
or automatically do Split(). It isn't used anywhere, and
isn't very consistent with the python features that are
about to be added. Do accept SCons.Node.FS.File arguments
though.
--HG--
extra : convert_revision : 0f3bb0e9e6806490330eea59a104013042b4dd49
-rw-r--r-- | src/SConscript | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/SConscript b/src/SConscript index 5efd2f794..da940c97a 100644 --- a/src/SConscript +++ b/src/SConscript @@ -33,21 +33,19 @@ import sys from os.path import join as joinpath +import SCons + # This file defines how to build a particular configuration of M5 # based on variable settings in the 'env' build environment. Import('*') sources = [] -def Source(*args): - for arg in args: - if isinstance(arg, (list, tuple)): - # Recurse to load a list - Source(*arg) - elif isinstance(arg, str): - sources.extend([ File(f) for f in Split(arg) ]) - else: - sources.append(File(arg)) +def Source(source): + if isinstance(source, SCons.Node.FS.File): + sources.append(source) + else: + sources.append(File(source)) Export('env') Export('Source') |