fixup! Find libasdcp-dcpomatic and xerces-c in a less flaky way.

1 files changed, 5 insertions, 6 deletions

diff --git a/wscript b/wscript
index 8f02388a..b58ade5d 100644
--- a/wscript
+++ b/wscript
@@ -169,12 +169,11 @@ def configure(conf):
     conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True)
     if conf.options.static:
         conf.env.STLIB_OPENJPEG = ['openjp2']
-        libs = ['asdcp-dcpomatic', 'kumu-dcpomatic']
-        for lib in libs:
-            conf.env.LIB_ASDCPLIB_DCPOMATIC.remove(lib)
-        conf.env.STLIB_ASDCPLIB_DCPOMATIC = libs
-        conf.env.LIB_CXML.remove('cxml')
-        conf.env.STLIB_CXML.append('cxml')
+        for lib in ('asdcp-dcpomatic', 'kumu-dcpomatic'):
+            conf.env['LIB_ASDCPLIB_DCPOMATIC'].remove(lib)
+            conf.env.append_value('STLIB_ASDCPLIB_DCPOMATIC', lib)
+        conf.env['LIB_CXML'].remove('cxml')
+        conf.env.append_value('STLIB_CXML', 'cxml')
 
     if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32:
         # XXX: it feels like there should be a more elegant way to get these included