citrun

commit 10d951c0f186d58309561f005c9710e3af69b386
parent a08a3ba8ae9bb7fa18ab63272b5939a8ab6c980b
Author: Kyle Milz <kyle@0x30.net>
Date:   Sat, 20 Aug 2016 10:52:49 -0600

Jam: link with the right linker

Diffstat:
M
Jamrules
 | 
27
++++++++++++++-------------
M
src/Jamfile
 | 
1
-

2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Jamrules b/Jamrules
@@ -17,7 +17,7 @@ OPTIM = $(CFLAGS) ;
 
 C++FLAGS += -std=c++11 ;
 
-_CLANG_LIBS =
+CLANG_LIBS =
 	-lclangAST
 	-lclangAnalysis
 	-lclangBasic
@@ -35,29 +35,30 @@ _CLANG_LIBS =
 
 if $(OS) = OPENBSD {
 	C++ = eg++ ;
+	# This adds libestdc++ automatically.
+	LINK = eg++ ;
 
-	CLANG_LIBS = -Wl,--start-group $(_CLANG_LIBS) -Wl,--end-group ;
 	PKG_CONFIG_LIBS = gl glew freetype2 ;
-	LINKLIBS on citrun-gl = -lestdc++ -lm -lglut ;
-	LINKLIBS on citrun-inst = -lestdc++ ;
-	LINKLIBS on citrun-term = -lestdc++ ;
-	LINKLIBS on citrun-dump = -L/usr/local/lib -lestdc++ ;
+	LINKLIBS on citrun-gl = -lm -lglut ;
+	LINKLIBS on citrun-inst += -Wl,--start-group $(CLANG_LIBS) -Wl,--end-group ;
 }
 
 if $(OS) = MACOSX {
+	LINK = c++ ;
+
 	PKG_CONFIG_LIBS = glew freetype2 ;
-	CLANG_LIBS = $(_CLANG_LIBS) ;
-	LINKLIBS on citrun-gl = -framework OpenGL -framework GLUT -lc++ -lm ;
-	LINKLIBS on citrun-inst = -lc++ ;
-	LINKLIBS on citrun-term = -lc++ ;
+	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.
-	CLANG_LIBS = -Wl,--start-group $(_CLANG_LIBS) -Wl,--end-group ;
 	PKG_CONFIG_LIBS = gl glew freetype2 ;
-	LINKLIBS on citrun-gl = -lbsd -lstdc++ -lm -lglut ;
-	LINKLIBS on citrun-inst = -lstdc++ -lbsd ;
+	LINKLIBS on citrun-gl = -lbsd -lm -lglut ;
+	LINKLIBS on citrun-inst = -lbsd ;
+	LINKLIBS on citrun-inst += -Wl,--start-group $(CLANG_LIBS) -Wl,--end-group ;
 }
 
 if $(CITRUN_SA) {
diff --git a/src/Jamfile b/src/Jamfile
@@ -74,7 +74,6 @@ LINKFLAGS on citrun-inst = `llvm-config --ldflags` ;
 
 LLVM_LIBS = bitreader mcparser transformutils option ;
 
-LINKLIBS on citrun-inst += $(CLANG_LIBS) ;
 LINKLIBS on citrun-inst += `llvm-config --libs $(LLVM_LIBS) --system-libs` ;
 
 Main citrun-inst : $(INST_SRCS) ;