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

Unified Diff: third_party/libxml/using_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
Index: third_party/libxml/using_libxml.scons
===================================================================
--- third_party/libxml/using_libxml.scons (revision 5775)
+++ third_party/libxml/using_libxml.scons (working copy)
@@ -8,28 +8,11 @@
Import("env")
-env.Append(
- CPPPATH = [
- '$LIBXML_DIR/include',
- '$LIBXML_DIR/DerivedSources/include',
- ],
- CPPDEFINES = [
- 'LIBXML_STATIC',
- ],
- LIBS = [
- env['XML_LIB'],
- ],
-)
-# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+if env.WantSystemLib('libxml'):
+ env.Append(LIBS = ['xml2'])
+else:
+ env.Append(LIBS = ['libxml'])
-__doc__ = """
-Settings for other components using the libxml library.
-"""
-
-Import("env")
-
env.Append(
CPPPATH = [
'$LIBXML_DIR/include',
@@ -38,7 +21,4 @@
CPPDEFINES = [
'LIBXML_STATIC',
],
- LIBS = [
- env['XML_LIB'],
- ],
)

Powered by Google App Engine
This is Rietveld 408576698