Hacks.wtf

2 files changed, 2 insertions, 6 deletions

diff --git a/cscript b/cscript
index 0c68cfec..46438b0c 100644
--- a/cscript
+++ b/cscript
@@ -58,9 +58,6 @@ def build(target, options):
         if target.distro == 'mageia' and target.version == '6':
             # Mageia 6 pulls the same stunt except it's libxml++ that requires C++11
             cmd += ' --force-cpp11'
-        if target.distro == 'fedora' or target.distro == 'mageia' or target.distro == 'centos':
-            # pkg-config doesn't tell us that we need this; it assumes we already know
-            target.append('LINKFLAGS', '-L/usr/lib64', ' ')
     elif target.platform == 'windows':
         cmd += ' --target-windows --disable-gcov --disable-tests'
         if target.version == 'xp':
diff --git a/wscript b/wscript
index 03e7f673..2f072d10 100644
--- a/wscript
+++ b/wscript
@@ -140,10 +140,9 @@ def configure(conf):
         conf.env.LIB_CXML = ['xml++-2.6', 'glibmm-2.4']
         conf.env.STLIB_CXML = ['cxml']
         conf.check_cfg(package='xerces-c', args='--cflags', uselib_store='XERCES', mandatory=True)
-        conf.env.STLIB_XERCES = ['xerces-c']
-        conf.env.LIB_XERCES = ['icuuc', 'curl']
+        conf.env.LIB_XERCES = ['xerces-c', 'icuuc', 'curl']
         # Hack to fix linker path on Centos/Mageia/Fedora etc.
-        conf.env.LIBPATH_XERCES = ['/usr/lib64']
+#        conf.env.LIBPATH_XERCES = ['/usr/lib64']
     else:
         if conf.options.jpeg == 'oj2':
             conf.check_cfg(package='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True)