diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/gzstream/SConscript | 10 | ||||
| -rw-r--r-- | ext/libelf/SConscript | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ext/gzstream/SConscript b/ext/gzstream/SConscript index ef591229e..c8432ae15 100644 --- a/ext/gzstream/SConscript +++ b/ext/gzstream/SConscript @@ -28,11 +28,11 @@ # # Authors: Nathan Binkert -Import('env') +Import('main') -env.Library('gzstream', [File('gzstream.cc')]) +main.Library('gzstream', [File('gzstream.cc')]) -env.Prepend(CPPPATH=Dir('.')) -env.Append(LIBS=['gzstream']) -env.Prepend(LIBPATH=[Dir('.')]) +main.Prepend(CPPPATH=Dir('.')) +main.Append(LIBS=['gzstream']) +main.Prepend(LIBPATH=[Dir('.')]) diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript index dff6fdaa9..71cf9840d 100644 --- a/ext/libelf/SConscript +++ b/ext/libelf/SConscript @@ -30,7 +30,7 @@ import os, subprocess -Import('env') +Import('main') elf_files = [] def ElfFile(filename): @@ -87,9 +87,9 @@ ElfFile('libelf_convert.c') ElfFile('libelf_fsize.c') ElfFile('libelf_msize.c') -m4env = env.Clone() -if env['GCC']: - major,minor,dot = [ int(x) for x in env['CXXVERSION'].split('.')] +m4env = main.Clone() +if m4env['GCC']: + major,minor,dot = [ int(x) for x in m4env['CXXVERSION'].split('.')] if major >= 4: m4env.Append(CCFLAGS=['-Wno-pointer-sign']) m4env.Append(CCFLAGS=['-Wno-implicit']) @@ -119,7 +119,7 @@ m4env.M4(target=File('libelf_msize.c'), # into either m5 or the library m4env.Library('elf', [m4env.SharedObject(f) for f in elf_files]) -env.Prepend(CPPPATH=Dir('.')) -env.Append(LIBS=['elf']) -env.Prepend(LIBPATH=[Dir('.')]) +main.Prepend(CPPPATH=Dir('.')) +main.Append(LIBS=['elf']) +main.Prepend(LIBPATH=[Dir('.')]) |