commit 0970a507c6e3d866e32d30861bd750a2d273c390
parent 38342ba7f38f1990201ed67a369ea8d96a9003ed
Author: Kyle Milz <kyle@0x30.net>
Date: Sat, 20 Aug 2016 11:17:46 -0600
Jam: some cleanup
Diffstat:
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Jamrules b/Jamrules
@@ -35,8 +35,6 @@ CLANG_LIBS =
if $(OS) = OPENBSD {
C++ = eg++ ;
- # This adds libestdc++ automatically.
- LINK = eg++ ;
PKG_CONFIG_LIBS = gl glew freetype2 ;
LINKLIBS on citrun-gl = -lm -lglut ;
@@ -44,16 +42,12 @@ if $(OS) = OPENBSD {
}
if $(OS) = MACOSX {
- LINK = c++ ;
-
PKG_CONFIG_LIBS = glew freetype2 ;
LINKLIBS on citrun-gl = -framework OpenGL -framework GLUT -lm ;
LINKLIBS on citrun-inst = $(CLANG_LIBS) ;
}
if $(OS) = LINUX {
- LINK = c++ ;
-
# llvm version is 3.5 on Debian, which is too old.
PKG_CONFIG_LIBS = gl glew freetype2 ;
LINKLIBS on citrun-gl = -lbsd -lm -lglut ;
@@ -62,6 +56,7 @@ if $(OS) = LINUX {
}
if $(CITRUN_SA) {
+ # scan-build sets these expecting us to pick up the new values.
CC = $(CC) ;
C++ = $(CXX) ;
}
@@ -73,6 +68,10 @@ if $(CITRUN_COVERAGE) {
LINKLIBS on citrun-dump += -coverage ;
}
+# Link with the c++ compiler so that the matching c++ runtime library gets added
+# automatically.
+LINK = $(C++) ;
+
actions Test {
prove ;
}
diff --git a/src/Jamfile b/src/Jamfile
@@ -23,7 +23,7 @@ Main citrun-dump : dump_main.cc ;
#
# citrun-term
#
-LINKLIBS on citrun-term += -lcurses -L/usr/local/lib ;
+LINKLIBS on citrun-term += -lcurses ;
LinkLibraries citrun-term : utils ;
Main citrun-term : term_main.cc ;