2 files changed, 7 insertions, 27 deletions
diff --git a/third_party/libxml/SConscript b/third_party/libxml/libxml.scons
index f952a96..d403cd4 100644
--- a/third_party/libxml/SConscript
+++ b/third_party/libxml/libxml.scons
@@ -29,6 +29,9 @@
 
 Import('env')
 
+if env.WantSystemLib('libxml'):
+  Return()
+
 env = env.Clone()
 
 env.Prepend(
@@ -40,9 +43,6 @@ env.Prepend(
         'DerivedSources/include',
         'include',
     ],
-)
-
-env.Append(
     CPPDEFINES = [
         'U_STATIC_IMPLEMENTATION',
         'LIBXML_STATIC',
diff --git a/third_party/libxml/using_libxml.scons b/third_party/libxml/using_libxml.scons
index 4a5c1329..709520f 100644
--- a/third_party/libxml/using_libxml.scons
+++ b/third_party/libxml/using_libxml.scons
@@ -8,27 +8,10 @@ Settings for other components using the libxml library.
 
 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.
-
-__doc__ = """
-Settings for other components using the libxml library.
-"""
-
-Import("env")
+if env.WantSystemLib('libxml'):
+  env.Append(LIBS = ['xml2'])
+else:
+  env.Append(LIBS = ['libxml'])
 
 env.Append(
     CPPPATH = [
@@ -38,7 +21,4 @@ env.Append(
     CPPDEFINES = [
         'LIBXML_STATIC',
     ],
-    LIBS = [
-        env['XML_LIB'],
-    ],
 )