From 67ab71ee8da5b455229a31e00c967850c4ad50ba Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 17 Oct 2015 00:24:19 -0700 Subject: [PATCH] Use LOCAL_LIBS instead of LIBS -- fewer conflicts --- site_scons/site_tools/lib.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site_scons/site_tools/lib.py b/site_scons/site_tools/lib.py index f5c59cb..dd47f61 100644 --- a/site_scons/site_tools/lib.py +++ b/site_scons/site_tools/lib.py @@ -12,13 +12,13 @@ import SCons.Script def _lib(env, name): - return env['LIBS'].get(name) + return env['LOCAL_LIBS'].get(name) def _register_lib(env, name, lib): - if name in env['LIBS']: + if name in env['LOCAL_LIBS']: env.log_error('Library has already been built: {}'.format(name)) - env['LIBS'][name] = lib + env['LOCAL_LIBS'][name] = lib def _lib_dirs(env): @@ -69,7 +69,7 @@ def _build_library(env, lib_func): # def generate(env): - env.SetDefault(LIBS={}) + env.SetDefault(LOCAL_LIBS={}) env.AddMethod(_process_lib_dir, 'LibDir') env.AddMethod(_build_library(env, env.Library), 'Library') env.AddMethod(_build_library(env, env.StaticLibrary), 'StaticLibrary')