From a012c59f76e2397fce9eaadacb1d2c094456b830 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 22 Sep 2018 18:31:16 +0200 Subject: [PATCH] try to fix the codecoverage results --- debian/rules | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 29d837e6..3d620eb9 100755 --- a/debian/rules +++ b/debian/rules @@ -131,6 +131,8 @@ ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS))) CXXFLAGS_EXTRA += -fprofile-arcs -ftest-coverage LDFLAGS_EXTRA += -coverage -lgcov RUN_TEST=yes + # OpenMP doesn't respect LDFLAGS + CMAKE_EXTRA+= -DLIBOMP_LDFLAGS="-coverage -lgcov" # don't pass LDFLAGS_EXTRA because it expects gcc arg endif ifneq (,$(filter scan-build,$(DEB_BUILD_OPTIONS))) @@ -356,7 +358,12 @@ LIBCXX_CMAKE_OPTIONS := \ $(CMAKE_EXTRA_LIBCXX) override_dh_auto_build: - $(PRE_PROCESS) $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=$(VENDOR) CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 +# start the full build process. Includes also openmp + $(PRE_PROCESS) $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=$(VENDOR) \ + CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" \ + LIBOMP_CXXFLAGS="$(CXXFLAGS_EXTRA)" LIBOMP_LDFLAGS="$(LDFLAGS_EXTRA)" \ + REQUIRES_RTTI=1 DEBUGMAKE=1 + ifeq (${LIBFUZZER_ENABLE},yes) cd $(TARGET_BUILD) \ CFLAGS=`dpkg-buildflags --get CFLAGS`; \