From 9177cda6bb5d13da9aad6ab1c88c6adb5c09cb45 Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Sat, 5 Jan 2019 21:49:58 +0100 Subject: [PATCH] TESTS - Allow compilation on Cygwin again. * -pthread not supported. * --coverage not supported. * -lblocksruntime not required. --- src/test/Makefile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/test/Makefile b/src/test/Makefile index 603dc3abd8..751a8e1da3 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -394,10 +394,22 @@ COMMON_FLAGS = \ ifeq ($(shell $(CC) -v 2>&1 | grep -q "clang version" && echo "clang"),clang) COMMON_FLAGS += -fblocks +ifndef CYGWIN LDFLAGS += -lBlocksRuntime endif +endif -ifndef MACOSX +USE_PTHREAD = YES +USE_COVERAGE = YES +ifdef MACOSX + USE_PTHREAD = +endif +ifdef CYGWIN + USE_PTHREAD = + USE_COVERAGE = +endif + +ifdef USE_PTHREAD COMMON_FLAGS += -pthread endif @@ -410,7 +422,9 @@ CXX_FLAGS = $(COMMON_FLAGS) \ -std=gnu++11 # Compiler flags for coverage instrumentation +ifdef USE_COVERAGE COVERAGE_FLAGS := --coverage +endif C_FLAGS += $(COVERAGE_FLAGS) CXX_FLAGS += $(COVERAGE_FLAGS)