From 18dbf34b720ebf7c6782bdfeb4de420f17254890 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 27 Jan 2014 12:25:51 -0800
Subject: [PATCH] remove env clone and instead just push DHAVE_LIBXML2 into
 main CPPDEFINES

---
 src/build.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/build.py b/src/build.py
index 1356305e9..620bcccf9 100644
--- a/src/build.py
+++ b/src/build.py
@@ -367,17 +367,8 @@ if env['XMLPARSER'] == 'libxml2' and env['HAS_LIBXML2']:
         """
         libxml2_loader.cpp
         """)
-    env2 = lib_env.Clone()
-    env2.Append(CPPDEFINES = '-DHAVE_LIBXML2')
+    lib_env.Append(CPPDEFINES = '-DHAVE_LIBXML2')
     libmapnik_defines.append('-DHAVE_LIBXML2')
-    fixup = ['libxml2_loader.cpp']
-    for cpp in fixup:
-        if cpp in source:
-            source.remove(cpp)
-        if env['LINKING'] == 'static':
-            source.insert(0,env2.StaticObject(cpp))
-        else:
-            source.insert(0,env2.SharedObject(cpp))
 else:
     source += Split(
         """