citrun

commit 54c1b6b1d8befaf1119614d391bbb06e70d4e88e
parent e38c5cca48fecab4907d0512c9091a92788d6437
Author: kyle <kyle@0x30.net>
Date:   Sun, 27 Nov 2016 23:04:02 -0700

Jamrules: CITRUN_COVERAGE is no more!

Diffstat:
M
Jamrules
 | 
23
+++++++++--------------
M
src/Jamfile
 | 
2
+-

2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/Jamrules b/Jamrules
@@ -16,10 +16,9 @@ else {
 	CFLAGS += -Wall -g ;
 }
 
-# Try and respect this, {pkg,llvm}-config gives -O? too unfortunately
-OPTIM = $(CFLAGS) ;
-
-C++FLAGS += -std=c++11 -fno-exceptions -fno-rtti ;
+CCFLAGS += $(CFLAGS) ;
+C++FLAGS += -std=c++11 -fno-exceptions -fno-rtti $(CFLAGS) ;
+LINKFLAGS += $(LDFLAGS) ;
 
 CLANG_LIBS =
 	-lclangAST
@@ -68,10 +67,13 @@ actions StaticAnalysis
 
 actions TestCoverage
 {
-	export CITRUN_COVERAGE=1
-	CFLAGS="-coverage -ggdb" jam -j4
+	set -e
+	CFLAGS="-coverage -ggdb" LDFLAGS="-coverage" jam -j4
+
+	# Roll libgcov.a into libcitrun.a.
+	ar -M < t/libcitrun_gcov.mri
 
-	prove || true
+	prove
 	# prove tt
 
 	gcov -o src src/rt.c
@@ -87,13 +89,6 @@ if $(CITRUN_SA) {
 	C++ = $(CXX) ;
 }
 
-if $(CITRUN_COVERAGE) {
-	LINKLIBS on citrun-gl += -coverage ;
-	LINKLIBS on citrun-inst += -coverage ;
-	LINKLIBS on citrun-term += -coverage ;
-	LINKLIBS on citrun-dump += -coverage ;
-}
-
 # Link with the c++ compiler so that the matching c++ runtime library gets added
 # automatically.
 LINK on citrun-inst citrun-term citrun-gl = $(C++) ;
diff --git a/src/Jamfile b/src/Jamfile
@@ -67,7 +67,7 @@ Stringize rt_h.h : rt.h ;
 ObjectC++Flags $(INST_SRCS) : `llvm-config --cxxflags` ;
 ObjectDefines $(INST_SRCS) : CITRUN_SHARE=\\\"$(CITRUN_SHARE)\\\" ;
 
-LINKFLAGS on citrun-inst = `llvm-config --ldflags` ;
+LINKFLAGS on citrun-inst = $(LINKFLAGS) `llvm-config --ldflags` ;
 
 LLVM_LIBS = bitreader mcparser transformutils option ;
 LINKLIBS on citrun-inst += `llvm-config --libs $(LLVM_LIBS) --system-libs` ;