summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-03-12 11:49:50 +0000
committerCarl Hetherington <cth@carlh.net>2019-03-12 11:49:50 +0000
commitd540b90f5faf1051656920ccc9644ba764e5bb2b (patch)
treecd7b6d47c7e9470aeed99104484bb916e1abe3ed
parentff595d9ac470739aa8464b003bb40098daaae8f2 (diff)
Fix gcov shlib build; this fixes tests to run against the locally-built libdcp rather than the installed one.
-rw-r--r--src/wscript2
-rw-r--r--wscript2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/wscript b/src/wscript
index 5fe7fc80..2359981b 100644
--- 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 743a0e8e..57fed173 100644
--- 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'])