Fix gcov shlib build; this fixes tests to run against the locally-built libdcp rather...

diff --git a/src/wscript b/src/wscript
index 5fe7fc802eb79e4e8b54dbd90485de10736d61e3..2359981b6c0ca794757df8288dd82177db43cadc 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -200,7 +200,7 @@ def build(bld):
 
     # Library for gcov
     if bld.is_defined('HAVE_GCOV'):
-        obj = bld(features='cxx cxxstlib')
+        obj = bld(features='cxx cxxshlib')
         obj.name = 'libdcp%s_gcov' % bld.env.API_VERSION
         obj.target = 'dcp%s_gcov' % bld.env.API_VERSION
         obj.export_includes = ['.']

diff --git a/wscript b/wscript
index 743a0e8e327d4fb4c680f031bc7cd9a14a9eb827..57fed17310bc134d8ffe7fdbc530bcea3a52f123 100644 (file)
--- a/wscript
+++ b/wscript
@@ -98,6 +98,8 @@ def configure(conf):
 
     if not conf.env.TARGET_WINDOWS:
         conf.env.append_value('LINKFLAGS', '-pthread')
+    if not conf.options.disable_gcov:
+        conf.env.append_value('LINKFLAGS', '-fprofile-arcs')
 
     if conf.options.jpeg == 'oj1':
         conf.env.append_value('CXXFLAGS', ['-DLIBDCP_OPENJPEG1'])