citrun

commit 60e74bd3b853d28c91e58240772d313f19c87585
parent 13bd38be5c2acdbc540b01a30dd13f0e9846f773
Author: Kyle Milz <kyle@0x30.net>
Date:   Tue, 10 Jan 2017 21:02:44 -0700

jam: get analysis build working again

Diffstat:
M
Jamrules.extra
 | 
6
+++---
M
configure
 | 
2
+-

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Jamrules.extra b/Jamrules.extra
@@ -26,9 +26,9 @@ if $(NT) {
 #
 # Different build modifiers for static analysis and test coverage.
 #
-actions StaticAnalysis
+actions Analysis
 {
-	scan-build ./configure
+	scan-build --use-c++=eg++ ./configure
 	scan-build -o html --use-c++=eg++ jam -j4
 }
 
@@ -51,5 +51,5 @@ actions TestCoverage
 	mv *.gcov gcov/
 }
 
-StaticAnalysis static-analysis ;
+Analysis analysis ;
 TestCoverage test-coverage ;
diff --git a/configure b/configure
@@ -20,7 +20,7 @@ if [ $uname = OpenBSD ]; then
 	LDGROUP_START="-Wl,--start-group"
 	LDGROUP_END="-Wl,--end-group"
 	FONT_PATH="/usr/X11R6/lib/X11/fonts/TTF/DejaVuSansMono.ttf"
-	CXX=eg++
+	CXX=${CXX-eg++}
 elif [ $uname = Darwin ]; then
 	GL_EXTRALIB="-framework OpenGL"
 	FONT_PATH="/Library/Fonts/Andale Mono.ttf"