diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-11-20 15:38:54 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-11-20 15:38:54 -0800 |
| commit | e35c4f2f089ad25cf3081cea50b018717dd0b192 (patch) | |
| tree | 48d39aff50851566811f1a2925eb59228e1f6af1 /src/SConscript | |
| parent | a12d5975cc8ea9462c731f58c0a950a8d3e44409 (diff) | |
| parent | 088d7c70968a6ba43eddb4116c35a707747b7216 (diff) | |
| download | gem5-e35c4f2f089ad25cf3081cea50b018717dd0b192.tar.xz | |
Merge with head.
--HG--
extra : convert_revision : c4215e516c6d82ad466db898ffeefa0233ca110e
Diffstat (limited to 'src/SConscript')
| -rw-r--r-- | src/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/SConscript b/src/SConscript index e66a725d3..8e6e1b45e 100644 --- a/src/SConscript +++ b/src/SConscript @@ -198,12 +198,12 @@ for root, dirs, files in os.walk(srcdir, topdown=True): extra_string = env['EXTRAS'] if extra_string and extra_string != '' and not extra_string.isspace(): for extra in extra_string.split(':'): - extra = os.path.expanduser(extra) - extra = os.path.normpath(extra) + print 'Adding', extra, 'to source directory list' env.Append(CPPPATH=[Dir(extra)]) for root, dirs, files in os.walk(extra, topdown=True): if 'SConscript' in files: subdir = root[len(os.path.dirname(extra))+1:] + print ' Found SConscript in', subdir build_dir = joinpath(env['BUILDDIR'], subdir) SConscript(joinpath(root, 'SConscript'), build_dir=build_dir) |