161c161
< # Set up the base build environment.
---
> # Set up the main build environment.
172,174c172,174
< env = Environment(ENV=use_env)
< env.root = Dir(".") # The current directory (where this file lives).
< env.srcdir = Dir("src") # The source directory
---
> main = Environment(ENV=use_env)
> main.root = Dir(".") # The current directory (where this file lives).
> main.srcdir = Dir("src") # The source directory
185c185
< hgdir = env.root.Dir(".hg")
---
> hgdir = main.root.Dir(".hg")
200c200
< """ % (env.root)
---
> """ % (main.root)
220c220
< hg_info = read_command(cmd, cwd=env.root.abspath).strip()
---
> hg_info = read_command(cmd, cwd=main.root.abspath).strip()
242d241
< env['HG_INFO'] = hg_info
243a243,244
> main['HG_INFO'] = hg_info
>
276c277
< abs_targets = [ normpath(joinpath(env.root.abspath, str(x))) for x in \
---
> abs_targets = [ normpath(joinpath(main.root.abspath, str(x))) for x in \
307c308
< Export('env')
---
> Export('main')
309c310
< env.SConsignFile(joinpath(build_root, "sconsign"))
---
> main.SConsignFile(joinpath(build_root, "sconsign"))
315c316
< env.SetOption('duplicate', 'soft-copy')
---
> main.SetOption('duplicate', 'soft-copy')
342,343c343,344
< ('CC', 'C compiler', environ.get('CC', env['CC'])),
< ('CXX', 'C++ compiler', environ.get('CXX', env['CXX'])),
---
> ('CC', 'C compiler', environ.get('CC', main['CC'])),
> ('CXX', 'C++ compiler', environ.get('CXX', main['CXX'])),
357c358
< help_text += global_sticky_vars.GenerateHelpText(env)
---
> help_text += global_sticky_vars.GenerateHelpText(main)
359,360c360,361
< # Update env with values from ARGUMENTS & file global_sticky_vars_file
< global_sticky_vars.Update(env)
---
> # Update main environment with values from ARGUMENTS & global_sticky_vars_file
> global_sticky_vars.Update(main)
363c364
< global_sticky_vars.Save(global_sticky_vars_file, env)
---
> global_sticky_vars.Save(global_sticky_vars_file, main)
367,369c368,370
< base_dir = env.srcdir.abspath
< if env['EXTRAS']:
< extras_dir_list = env['EXTRAS'].split(':')
---
> base_dir = main.srcdir.abspath
> if main['EXTRAS']:
> extras_dir_list = main['EXTRAS'].split(':')
377c378
< env.Append(CPPPATH=[Dir('ext')])
---
> main.Append(CPPPATH=[Dir('ext')])
380c381
< env.Append(ENV = { 'M5_PLY' : Dir('ext/ply').abspath })
---
> main.Append(ENV = { 'M5_PLY' : Dir('ext/ply').abspath })
382,383c383,384
< CXX_version = read_command([env['CXX'],'--version'], exception=False)
< CXX_V = read_command([env['CXX'],'-V'], exception=False)
---
> CXX_version = read_command([main['CXX'],'--version'], exception=False)
> CXX_V = read_command([main['CXX'],'-V'], exception=False)
385,388c386,389
< env['GCC'] = CXX_version and CXX_version.find('g++') >= 0
< env['SUNCC'] = CXX_V and CXX_V.find('Sun C++') >= 0
< env['ICC'] = CXX_V and CXX_V.find('Intel') >= 0
< if env['GCC'] + env['SUNCC'] + env['ICC'] > 1:
---
> main['GCC'] = CXX_version and CXX_version.find('g++') >= 0
> main['SUNCC'] = CXX_V and CXX_V.find('Sun C++') >= 0
> main['ICC'] = CXX_V and CXX_V.find('Intel') >= 0
> if main['GCC'] + main['SUNCC'] + main['ICC'] > 1:
393,398c394,399
< if env['GCC']:
< env.Append(CCFLAGS='-pipe')
< env.Append(CCFLAGS='-fno-strict-aliasing')
< env.Append(CCFLAGS=Split('-Wall -Wno-sign-compare -Werror -Wundef'))
< env.Append(CXXFLAGS='-Wno-deprecated')
< elif env['ICC']:
---
> if main['GCC']:
> main.Append(CCFLAGS='-pipe')
> main.Append(CCFLAGS='-fno-strict-aliasing')
> main.Append(CCFLAGS=Split('-Wall -Wno-sign-compare -Werror -Wundef'))
> main.Append(CXXFLAGS='-Wno-deprecated')
> elif main['ICC']:
400,406c401,407
< elif env['SUNCC']:
< env.Append(CCFLAGS='-Qoption ccfe')
< env.Append(CCFLAGS='-features=gcc')
< env.Append(CCFLAGS='-features=extensions')
< env.Append(CCFLAGS='-library=stlport4')
< env.Append(CCFLAGS='-xar')
< #env.Append(CCFLAGS='-instances=semiexplicit')
---
> elif main['SUNCC']:
> main.Append(CCFLAGS='-Qoption ccfe')
> main.Append(CCFLAGS='-features=gcc')
> main.Append(CCFLAGS='-features=extensions')
> main.Append(CCFLAGS='-library=stlport4')
> main.Append(CCFLAGS='-xar')
> #main.Append(CCFLAGS='-instances=semiexplicit')
414,419c415,420
< if env['BATCH']:
< env['CC'] = env['BATCH_CMD'] + ' ' + env['CC']
< env['CXX'] = env['BATCH_CMD'] + ' ' + env['CXX']
< env['AS'] = env['BATCH_CMD'] + ' ' + env['AS']
< env['AR'] = env['BATCH_CMD'] + ' ' + env['AR']
< env['RANLIB'] = env['BATCH_CMD'] + ' ' + env['RANLIB']
---
> if main['BATCH']:
> main['CC'] = main['BATCH_CMD'] + ' ' + main['CC']
> main['CXX'] = main['BATCH_CMD'] + ' ' + main['CXX']
> main['AS'] = main['BATCH_CMD'] + ' ' + main['AS']
> main['AR'] = main['BATCH_CMD'] + ' ' + main['AR']
> main['RANLIB'] = main['BATCH_CMD'] + ' ' + main['RANLIB']
423c424
< env.Append(CCFLAGS=Split("-Wno-uninitialized"))
---
> main.Append(CCFLAGS=Split("-Wno-uninitialized"))
426c427
< if not env.has_key('SWIG'):
---
> if not main.has_key('SWIG'):
447c448
< env.Append(SWIGFLAGS=swig_flags)
---
> main.Append(SWIGFLAGS=swig_flags)
452c453
< for scanner in env['SCANNERS']:
---
> for scanner in main['SCANNERS']:
468c469
< env['SCANNERS'] = scanners
---
> main['SCANNERS'] = scanners
498c499
< conf = Configure(env,
---
> conf = Configure(main,
513,516c514,517
< env.Append(CCFLAGS='-arch x86_64')
< env.Append(CFLAGS='-arch x86_64')
< env.Append(LINKFLAGS='-arch x86_64')
< env.Append(ASFLAGS='-arch x86_64')
---
> main.Append(CCFLAGS='-arch x86_64')
> main.Append(CFLAGS='-arch x86_64')
> main.Append(LINKFLAGS='-arch x86_64')
> main.Append(ASFLAGS='-arch x86_64')
537c538
< conf = NullConf(env)
---
> conf = NullConf(main)
570,571c571,572
< env.Append(CPPPATH=py_includes)
< env.Append(LIBPATH=py_lib_path)
---
> main.Append(CPPPATH=py_includes)
> main.Append(LIBPATH=py_lib_path)
633c634
< env = conf.Finish()
---
> main = conf.Finish()
640,641d640
< Export('env')
<
753c752
< env.Append(BUILDERS = { 'ConfigFile' : config_builder })
---
> main.Append(BUILDERS = { 'ConfigFile' : config_builder })
756,757c755,756
< env.SConscript('ext/libelf/SConscript',
< variant_dir = joinpath(build_root, 'libelf'))
---
> main.SConscript('ext/libelf/SConscript',
> variant_dir = joinpath(build_root, 'libelf'))
760,761c759,760
< env.SConscript('ext/gzstream/SConscript',
< variant_dir = joinpath(build_root, 'gzstream'))
---
> main.SConscript('ext/gzstream/SConscript',
> variant_dir = joinpath(build_root, 'gzstream'))
769c768
< env['ALL_ISA_LIST'] = all_isa_list
---
> main['ALL_ISA_LIST'] = all_isa_list
809,811d807
< # rename base env
< base_env = env
<
816c812
< env = base_env.Clone()
---
> env = main.Clone()
< # Set up the base build environment.
---
> # Set up the main build environment.
172,174c172,174
< env = Environment(ENV=use_env)
< env.root = Dir(".") # The current directory (where this file lives).
< env.srcdir = Dir("src") # The source directory
---
> main = Environment(ENV=use_env)
> main.root = Dir(".") # The current directory (where this file lives).
> main.srcdir = Dir("src") # The source directory
185c185
< hgdir = env.root.Dir(".hg")
---
> hgdir = main.root.Dir(".hg")
200c200
< """ % (env.root)
---
> """ % (main.root)
220c220
< hg_info = read_command(cmd, cwd=env.root.abspath).strip()
---
> hg_info = read_command(cmd, cwd=main.root.abspath).strip()
242d241
< env['HG_INFO'] = hg_info
243a243,244
> main['HG_INFO'] = hg_info
>
276c277
< abs_targets = [ normpath(joinpath(env.root.abspath, str(x))) for x in \
---
> abs_targets = [ normpath(joinpath(main.root.abspath, str(x))) for x in \
307c308
< Export('env')
---
> Export('main')
309c310
< env.SConsignFile(joinpath(build_root, "sconsign"))
---
> main.SConsignFile(joinpath(build_root, "sconsign"))
315c316
< env.SetOption('duplicate', 'soft-copy')
---
> main.SetOption('duplicate', 'soft-copy')
342,343c343,344
< ('CC', 'C compiler', environ.get('CC', env['CC'])),
< ('CXX', 'C++ compiler', environ.get('CXX', env['CXX'])),
---
> ('CC', 'C compiler', environ.get('CC', main['CC'])),
> ('CXX', 'C++ compiler', environ.get('CXX', main['CXX'])),
357c358
< help_text += global_sticky_vars.GenerateHelpText(env)
---
> help_text += global_sticky_vars.GenerateHelpText(main)
359,360c360,361
< # Update env with values from ARGUMENTS & file global_sticky_vars_file
< global_sticky_vars.Update(env)
---
> # Update main environment with values from ARGUMENTS & global_sticky_vars_file
> global_sticky_vars.Update(main)
363c364
< global_sticky_vars.Save(global_sticky_vars_file, env)
---
> global_sticky_vars.Save(global_sticky_vars_file, main)
367,369c368,370
< base_dir = env.srcdir.abspath
< if env['EXTRAS']:
< extras_dir_list = env['EXTRAS'].split(':')
---
> base_dir = main.srcdir.abspath
> if main['EXTRAS']:
> extras_dir_list = main['EXTRAS'].split(':')
377c378
< env.Append(CPPPATH=[Dir('ext')])
---
> main.Append(CPPPATH=[Dir('ext')])
380c381
< env.Append(ENV = { 'M5_PLY' : Dir('ext/ply').abspath })
---
> main.Append(ENV = { 'M5_PLY' : Dir('ext/ply').abspath })
382,383c383,384
< CXX_version = read_command([env['CXX'],'--version'], exception=False)
< CXX_V = read_command([env['CXX'],'-V'], exception=False)
---
> CXX_version = read_command([main['CXX'],'--version'], exception=False)
> CXX_V = read_command([main['CXX'],'-V'], exception=False)
385,388c386,389
< env['GCC'] = CXX_version and CXX_version.find('g++') >= 0
< env['SUNCC'] = CXX_V and CXX_V.find('Sun C++') >= 0
< env['ICC'] = CXX_V and CXX_V.find('Intel') >= 0
< if env['GCC'] + env['SUNCC'] + env['ICC'] > 1:
---
> main['GCC'] = CXX_version and CXX_version.find('g++') >= 0
> main['SUNCC'] = CXX_V and CXX_V.find('Sun C++') >= 0
> main['ICC'] = CXX_V and CXX_V.find('Intel') >= 0
> if main['GCC'] + main['SUNCC'] + main['ICC'] > 1:
393,398c394,399
< if env['GCC']:
< env.Append(CCFLAGS='-pipe')
< env.Append(CCFLAGS='-fno-strict-aliasing')
< env.Append(CCFLAGS=Split('-Wall -Wno-sign-compare -Werror -Wundef'))
< env.Append(CXXFLAGS='-Wno-deprecated')
< elif env['ICC']:
---
> if main['GCC']:
> main.Append(CCFLAGS='-pipe')
> main.Append(CCFLAGS='-fno-strict-aliasing')
> main.Append(CCFLAGS=Split('-Wall -Wno-sign-compare -Werror -Wundef'))
> main.Append(CXXFLAGS='-Wno-deprecated')
> elif main['ICC']:
400,406c401,407
< elif env['SUNCC']:
< env.Append(CCFLAGS='-Qoption ccfe')
< env.Append(CCFLAGS='-features=gcc')
< env.Append(CCFLAGS='-features=extensions')
< env.Append(CCFLAGS='-library=stlport4')
< env.Append(CCFLAGS='-xar')
< #env.Append(CCFLAGS='-instances=semiexplicit')
---
> elif main['SUNCC']:
> main.Append(CCFLAGS='-Qoption ccfe')
> main.Append(CCFLAGS='-features=gcc')
> main.Append(CCFLAGS='-features=extensions')
> main.Append(CCFLAGS='-library=stlport4')
> main.Append(CCFLAGS='-xar')
> #main.Append(CCFLAGS='-instances=semiexplicit')
414,419c415,420
< if env['BATCH']:
< env['CC'] = env['BATCH_CMD'] + ' ' + env['CC']
< env['CXX'] = env['BATCH_CMD'] + ' ' + env['CXX']
< env['AS'] = env['BATCH_CMD'] + ' ' + env['AS']
< env['AR'] = env['BATCH_CMD'] + ' ' + env['AR']
< env['RANLIB'] = env['BATCH_CMD'] + ' ' + env['RANLIB']
---
> if main['BATCH']:
> main['CC'] = main['BATCH_CMD'] + ' ' + main['CC']
> main['CXX'] = main['BATCH_CMD'] + ' ' + main['CXX']
> main['AS'] = main['BATCH_CMD'] + ' ' + main['AS']
> main['AR'] = main['BATCH_CMD'] + ' ' + main['AR']
> main['RANLIB'] = main['BATCH_CMD'] + ' ' + main['RANLIB']
423c424
< env.Append(CCFLAGS=Split("-Wno-uninitialized"))
---
> main.Append(CCFLAGS=Split("-Wno-uninitialized"))
426c427
< if not env.has_key('SWIG'):
---
> if not main.has_key('SWIG'):
447c448
< env.Append(SWIGFLAGS=swig_flags)
---
> main.Append(SWIGFLAGS=swig_flags)
452c453
< for scanner in env['SCANNERS']:
---
> for scanner in main['SCANNERS']:
468c469
< env['SCANNERS'] = scanners
---
> main['SCANNERS'] = scanners
498c499
< conf = Configure(env,
---
> conf = Configure(main,
513,516c514,517
< env.Append(CCFLAGS='-arch x86_64')
< env.Append(CFLAGS='-arch x86_64')
< env.Append(LINKFLAGS='-arch x86_64')
< env.Append(ASFLAGS='-arch x86_64')
---
> main.Append(CCFLAGS='-arch x86_64')
> main.Append(CFLAGS='-arch x86_64')
> main.Append(LINKFLAGS='-arch x86_64')
> main.Append(ASFLAGS='-arch x86_64')
537c538
< conf = NullConf(env)
---
> conf = NullConf(main)
570,571c571,572
< env.Append(CPPPATH=py_includes)
< env.Append(LIBPATH=py_lib_path)
---
> main.Append(CPPPATH=py_includes)
> main.Append(LIBPATH=py_lib_path)
633c634
< env = conf.Finish()
---
> main = conf.Finish()
640,641d640
< Export('env')
<
753c752
< env.Append(BUILDERS = { 'ConfigFile' : config_builder })
---
> main.Append(BUILDERS = { 'ConfigFile' : config_builder })
756,757c755,756
< env.SConscript('ext/libelf/SConscript',
< variant_dir = joinpath(build_root, 'libelf'))
---
> main.SConscript('ext/libelf/SConscript',
> variant_dir = joinpath(build_root, 'libelf'))
760,761c759,760
< env.SConscript('ext/gzstream/SConscript',
< variant_dir = joinpath(build_root, 'gzstream'))
---
> main.SConscript('ext/gzstream/SConscript',
> variant_dir = joinpath(build_root, 'gzstream'))
769c768
< env['ALL_ISA_LIST'] = all_isa_list
---
> main['ALL_ISA_LIST'] = all_isa_list
809,811d807
< # rename base env
< base_env = env
<
816c812
< env = base_env.Clone()
---
> env = main.Clone()