diff options
| -rw-r--r-- | Makefile.rules | 4 | ||||
| -rw-r--r-- | Makefile.toolchain | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.rules b/Makefile.rules index a02a89f3be..be7885a198 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -409,10 +409,10 @@ bldversion=$(shell (./util/getversion.sh ; echo VERSION) | $(CPP) -P -) # lcov fails when multiple instances run at the same time. # We need to run them sequentially by using flock cmd_lcov=flock /tmp/ec-lcov-lock -c "lcov --gcov-tool \ - $(CURDIR)/util/llvm-gcov.sh -q -o $@ -c -d build/coverage/$* -t $* \ + $(HOSTGCOV) -q -o $@ -c -d build/coverage/$* -t $* \ --exclude '*/ec/test/*' --exclude '*/ec/include/tests/*'" cmd_lcov-initial=flock /tmp/ec-lcov-lock -c "lcov --gcov-tool \ - $(CURDIR)/util/llvm-gcov.sh -q -o $@ -c -d build/coverage/initial-$* \ + $(GCOV) -q -o $@ -c -d build/coverage/initial-$* \ -i -t $* --exclude '*/ec/test/*' --exclude '*/ec/include/tests/*'" cmd_merge_cov=lcov -o build/coverage/lcov.info $(foreach info,$^,-a ${info}) cmd_report_cov=genhtml -q -o build/coverage/coverage_rpt -t \ diff --git a/Makefile.toolchain b/Makefile.toolchain index fbd6af1276..ecfaeb6dd6 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -47,6 +47,8 @@ HOSTCC?=$(CCACHE) $(HOST_CROSS_COMPILE)gcc HOSTCXX?=$(CCACHE) $(HOST_CROSS_COMPILE)clang++ HOST_PKG_CONFIG?=$(HOST_CROSS_COMPILE)pkg-config PROTOC?=protoc +GCOV=$(CROSS_COMPILE)gcov +HOSTGCOV=$(CURDIR)/util/llvm-gcov.sh C_WARN = -Wstrict-prototypes -Wdeclaration-after-statement -Wno-pointer-sign COMMON_WARN = -Wall -Wundef -Werror -Werror-implicit-function-declaration \ |