Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(505)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/zlib/zlib.scons

Issue 11430: Fix use of LOAD= with WantSystemLib()... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« site_scons/site_tools/chromium_builders.py ('K') | « third_party/lzma_sdk/lzma_sdk.scons ('k') | webkit/SConscript » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/zlib.scons
===================================================================
--- third_party/zlib/zlib.scons (revision 5775)
+++ third_party/zlib/zlib.scons (working copy)
@@ -8,8 +8,16 @@
Import('env')
+if env.WantSystemLib('zlib'):
+ root_env.Append(ZLIB_LIB = ['z'])
+ Return()
+
env = env.Clone()
+env.Append(
+ ZLIB_LIB = ['zlib'],
+)
+
if env['PLATFORM'] == 'win32':
env.Append(
CCFLAGS = [
« site_scons/site_tools/chromium_builders.py ('K') | « third_party/lzma_sdk/lzma_sdk.scons ('k') | webkit/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698