diff options
| author | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2020-08-10 15:14:31 +0300 |
|---|---|---|
| committer | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2020-08-10 15:14:31 +0300 |
| commit | 5ab474123fac0fc6ae9cb2dc58ffd90f3d0d6b62 (patch) | |
| tree | c9c64e6426d7ca79a510749ad53eb49eda61f7a6 | |
| parent | a14ac3f293b43113acfdfb7c51cee79dac978217 (diff) | |
SConstruct: make environment overriding more consistent
| -rw-r--r-- | tests/SConstruct | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/tests/SConstruct b/tests/SConstruct index 2f67061..7b4db80 100644 --- a/tests/SConstruct +++ b/tests/SConstruct @@ -22,7 +22,7 @@ scons CC=clang CXX=clang++ import os import platform -env = Environment(ENV = os.environ, tools = ['default', 'nanopb']) +env = Environment(ENV = os.environ, tools = ['default', 'nanopb'], **ARGUMENTS) env.SConsignFile("build/sconsign") env.Replace(CONFIGUREDIR = "build/config") @@ -47,20 +47,6 @@ except: if platform.system() == "Darwin": env.Replace(CC = "clang", CXX = "clang") -# Allow overriding the compiler with scons CC=??? -if 'CC' in ARGUMENTS: env.Replace(CC = ARGUMENTS['CC']) -if 'CXX' in ARGUMENTS: env.Replace(CXX = ARGUMENTS['CXX']) -if 'LINK' in ARGUMENTS: env.Replace(LINK = ARGUMENTS['LINK']) -if 'CCFLAGS' in ARGUMENTS: env.Append(CCFLAGS = ARGUMENTS['CCFLAGS']) -if 'CXXFLAGS' in ARGUMENTS: env.Append(CXXFLAGS = ARGUMENTS['CXXFLAGS']) -if 'LINKFLAGS' in ARGUMENTS: env.Append(LINKFLAGS = ARGUMENTS['LINKFLAGS']) -if 'LINKLIBS' in ARGUMENTS: env.Append(LINKLIBS = ARGUMENTS['LINKLIBS']) -if 'PROTOC' in ARGUMENTS: env.Replace(PROTOC = ARGUMENTS['PROTOC']) -if 'PROTOCFLAGS' in ARGUMENTS: env.Replace(PROTOCFLAGS = ARGUMENTS['PROTOCFLAGS']) -if 'NODEFARGS' in ARGUMENTS: env.Replace(NODEFARGS = ARGUMENTS['NODEFARGS']) -if 'NOVALGRIND' in ARGUMENTS: env.Replace(NOVALGRIND = ARGUMENTS['NOVALGRIND']) -if 'PYTHON' in ARGUMENTS: env.Replace(PYTHON = ARGUMENTS['PYTHON']) - # Add the builders defined in site_init.py add_nanopb_builders(env) |