From 919c52a98200dad9d4905795ea242e4e1a2dcb74 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Thu, 9 Jun 2022 00:29:50 +0200 Subject: [PATCH] Fixed gcov linker options in GH actions --- .github/workflows/build.yml | 2 +- Makefile | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b57dd2b7..2a7efbc7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10 - name: Build and unit test run: | - NUMPROC=2 CMAKE_CXX_FLAGS="--coverage -fno-inline" make test + NUMPROC=2 CMAKE_CXX_FLAGS="--coverage -fno-inline" CMAKE_EXE_LINKER_FLAGS="-lgcov --coverage" make test - name: Run coverage run: | lcov -c -d debug -o coverage.info diff --git a/Makefile b/Makefile index ba24b0dc..6aaeb204 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ NUMPROC ?= $(shell nproc) LLVM_CONFIG_PATH ?= CMAKE_CXX_FLAGS ?= +CMAKE_EXE_LINKER_FLAGS ?= .PHONY: clean clean: @@ -34,6 +35,7 @@ debug/CMakeLists.txt: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \ + -DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \ -DLLVM_CONFIG_PATH=$(LLVM_CONFIG_PATH) release/CMakeLists.txt: @@ -41,6 +43,7 @@ release/CMakeLists.txt: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \ + -DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \ -DLLVM_CONFIG_PATH=$(LLVM_CONFIG_PATH) debug: debug/CMakeLists.txt