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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libxml/libxml.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/libxml/SConscript ('k') | third_party/libxml/using_libxml.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libxml/libxml.scons
===================================================================
--- third_party/libxml/libxml.scons (revision 5550)
+++ third_party/libxml/libxml.scons (working copy)
@@ -29,6 +29,9 @@
Import('env')
+if env.WantSystemLib('libxml'):
+ Return()
+
env = env.Clone()
env.Prepend(
@@ -40,9 +43,6 @@
'DerivedSources/include',
'include',
],
-)
-
-env.Append(
CPPDEFINES = [
'U_STATIC_IMPLEMENTATION',
'LIBXML_STATIC',
Property changes on: third_party/libxml/libxml.scons
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/third_party/libxml/SConscript:r69-2775
« site_scons/site_tools/chromium_builders.py ('K') | « third_party/libxml/SConscript ('k') | third_party/libxml/using_libxml.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698