| SConstruct (8960:e7adb2ea547e) | SConstruct (8980:903a824a0583) |
|---|---|
| 1# -*- mode:python -*- 2 3# Copyright (c) 2011 Advanced Micro Devices, Inc. 4# Copyright (c) 2009 The Hewlett-Packard Development Company 5# Copyright (c) 2004-2005 The Regents of The University of Michigan 6# All rights reserved. 7# 8# Redistribution and use in source and binary forms, with or without --- 164 unchanged lines hidden (view full) --- 173termcap = get_termcap(GetOption('use_colors')) 174 175######################################################################## 176# 177# Set up the main build environment. 178# 179######################################################################## 180use_vars = set([ 'AS', 'AR', 'CC', 'CXX', 'HOME', 'LD_LIBRARY_PATH', 'PATH', | 1# -*- mode:python -*- 2 3# Copyright (c) 2011 Advanced Micro Devices, Inc. 4# Copyright (c) 2009 The Hewlett-Packard Development Company 5# Copyright (c) 2004-2005 The Regents of The University of Michigan 6# All rights reserved. 7# 8# Redistribution and use in source and binary forms, with or without --- 164 unchanged lines hidden (view full) --- 173termcap = get_termcap(GetOption('use_colors')) 174 175######################################################################## 176# 177# Set up the main build environment. 178# 179######################################################################## 180use_vars = set([ 'AS', 'AR', 'CC', 'CXX', 'HOME', 'LD_LIBRARY_PATH', 'PATH', |
| 181 'PYTHONPATH', 'RANLIB' ]) | 181 'PYTHONPATH', 'RANLIB', 'SWIG' ]) |
| 182 183use_env = {} 184for key,val in os.environ.iteritems(): 185 if key in use_vars or key.startswith("M5"): 186 use_env[key] = val 187 188main = Environment(ENV=use_env) 189main.Decider('MD5-timestamp') --- 153 unchanged lines hidden (view full) --- 343 344global_vars_file = joinpath(build_root, 'variables.global') 345 346global_vars = Variables(global_vars_file, args=ARGUMENTS) 347 348global_vars.AddVariables( 349 ('CC', 'C compiler', environ.get('CC', main['CC'])), 350 ('CXX', 'C++ compiler', environ.get('CXX', main['CXX'])), | 182 183use_env = {} 184for key,val in os.environ.iteritems(): 185 if key in use_vars or key.startswith("M5"): 186 use_env[key] = val 187 188main = Environment(ENV=use_env) 189main.Decider('MD5-timestamp') --- 153 unchanged lines hidden (view full) --- 343 344global_vars_file = joinpath(build_root, 'variables.global') 345 346global_vars = Variables(global_vars_file, args=ARGUMENTS) 347 348global_vars.AddVariables( 349 ('CC', 'C compiler', environ.get('CC', main['CC'])), 350 ('CXX', 'C++ compiler', environ.get('CXX', main['CXX'])), |
| 351 ('SWIG', 'SWIG tool', environ.get('SWIG', main['SWIG'])), |
|
| 351 ('BATCH', 'Use batch pool for build and tests', False), 352 ('BATCH_CMD', 'Batch pool submission command name', 'qdo'), 353 ('M5_BUILD_CACHE', 'Cache built objects in this directory', False), 354 ('EXTRAS', 'Add extra directories to the compilation', '') 355 ) 356 357# Update main environment with values from ARGUMENTS & global_vars_file 358global_vars.Update(main) --- 684 unchanged lines hidden --- | 352 ('BATCH', 'Use batch pool for build and tests', False), 353 ('BATCH_CMD', 'Batch pool submission command name', 'qdo'), 354 ('M5_BUILD_CACHE', 'Cache built objects in this directory', False), 355 ('EXTRAS', 'Add extra directories to the compilation', '') 356 ) 357 358# Update main environment with values from ARGUMENTS & global_vars_file 359global_vars.Update(main) --- 684 unchanged lines hidden --- |