commit 3118708119a43d9dd745e8495d8467c368ca5a39
parent 8dda7f313cf450ada3fa38fa757d12c75b546468
Author: Kyle Milz <krwmilz@gmail.com>
Date: Sat, 24 Mar 2018 19:43:15 -0700
jam: remove special handing of CC and C++ env vars
Diffstat:
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/Jamrules b/Jamrules
@@ -4,17 +4,14 @@ echo ░▀▀▀░░░▀▀▀░░▀░░░░▀░▀░▀▀▀░
echo ;
PREFIX ?= `pwd` ;
-CC = $(CC:E=clang) ;
-C++ = $(CXX:E=clang++) ;
echo PREFIX \= $(PREFIX) ;
-echo CC \= $(CC) ;
-echo C++ \= $(C++) ;
echo CFLAGS \= $(CFLAGS) ;
echo LDFLAGS \= $(LDFLAGS) ;
echo ;
if $(OS) = "OPENBSD" {
+ INST_EXTRALIB = "-lstdc++" ;
echo "Good to go soldier." ;
}
else if $(OS) = "Darwin" {
@@ -79,7 +76,7 @@ actions PkgConfig
actions C++11
{
- $(C++) -x c++ -std=c++11 -E - < /dev/null > /dev/null
+ $(CC) -x c++ -std=c++11 -E - < /dev/null > /dev/null
}
C++11 check_dependencies ;
@@ -90,7 +87,7 @@ PkgConfig check_dependencies ;
#
actions Analysis
{
- scan-build --use-c++=clang++ -o html jam -j4
+ scan-build -o html jam -j4
}
#
diff --git a/bin/Jamfile b/bin/Jamfile
@@ -11,7 +11,6 @@ Shell citrun_report : report.awk ;
#
# citrun_wrap
#
-SHELLHEADER on citrun_wrap = "#!/bin/sh" ;
MakeLocate citrun_wrap : bin ;
Shell citrun_wrap : wrap.sh ;
ReplacePrefix citrun_wrap ;
@@ -83,10 +82,6 @@ LinkLibraries citrun_gl citrun_gltest : gl_common libglyphy ;
Main citrun_gl : gl.cc ;
Main citrun_gltest : gltest.cc ;
-# Link with the c++ compiler so that the matching c++ runtime library gets added
-# automatically.
-LINK on citrun_inst citrun_gl citrun_gltest = $(C++) ;
-
#
# install
#