From: Nathan Binkert <binkertn@umich.edu>
Date: Thu, 12 Apr 2007 16:07:59 +0000 (-0700)
Subject: Don't allow Source to accept multiple arguments, lists,
X-Git-Tag: m5_2.0_beta3~37
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eefbda7f7c54735791dab70626a40a7d29aa8a80;p=gem5.git

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
---

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')