From 11e020fcd65c415dc46d10ae9dbe6ba63600ee4c Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Fri, 21 Nov 2008 06:04:04 +0000 Subject: Fix use of LOAD= with WantSystemLib() (we could blow up if a variable hadn't been added to the config) and extend use of LOAD= into submodules: * Add a ChromeLoadSConscriptModules() method that encapsulates the conditional logic, and makes things more readable by specifying component names as keyword arguments, not hard-coding the logic as a series of if-tests. * Put the ChromeLoadSConscriptModules() logic in a Tool module in site_scons/site_tools, so it doesn't clutter up build/SConscript.main directly. * Move env.WantSystemLib() calls into the individual *.scons files, so we call them each time (or not, based one LOAD=) and the config itself just returns if the system library is requested and we don't need to build anything locally. * Move the settings where a library name changes based on whether or not the system lib is being used into the using_*.scons files, so they're available to clients independently of whether or not the component's *.scons configuration is loaded. * While here: rename the affected third_party SConscript files: third_party/libjpeg/SConscript => third_party/libjpeg/libjpeg.scons third_party/libxml/SConscript => third_party/libxml/libxml.scons third_party/libxslt/SConscript => third_party/libxslt/libxslt.scons * While here: move the Chrome{Program,SharedLibrary}() etc. builder definitions from build/SConscript.main to a new too Ad the ChromeLoadSConscriptModules() logic in a Tool module, to remove more clutter from build/SConscript.main. Review URL: http://codereview.chromium.org/11430 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5820 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/bzip2/using_bzip2.scons | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'third_party/bzip2/using_bzip2.scons') diff --git a/third_party/bzip2/using_bzip2.scons b/third_party/bzip2/using_bzip2.scons index b41bca2..cbe837c 100644 --- a/third_party/bzip2/using_bzip2.scons +++ b/third_party/bzip2/using_bzip2.scons @@ -8,8 +8,7 @@ Settings for other components using the bzip2 library. Import("env") -env.Append( - LIBS = [ - env['BZIP2_LIB'], - ], -) +if env.WantSystemLib('bzip2'): + env.Append(LIBS = ['bz2']) +else: + env.Append(LIBS = ['bzip2']) -- cgit v1.1