commit 71e585db09a36d2b4b59197cee7e79b98a8d2e9f
parent db825b1ba844e40156932b6f7987cd72bf5c2c3b
Author: Kyle Milz <kyle@0x30.net>
Date: Wed, 13 Jul 2016 23:34:47 -0600
src: move citrun-inst defines closer to it
Diffstat:
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/Jamrules b/Jamrules
@@ -13,11 +13,6 @@ else {
# Packaging systems like for build systems to respect this.
OPTIM = $(CFLAGS) ;
-# These get baked into citrun-inst because it needs to know:
-# - the exact location of the runtime library
-# - the PATH component it came from, so it can remove itself
-C++FLAGS += -DCITRUN_LIB=$(CITRUN_LIB) -DCITRUN_PATH=$(CITRUN_PATH) ;
-
if $(OS) = OPENBSD {
C++ = eg++ ;
diff --git a/src/Jamfile b/src/Jamfile
@@ -56,6 +56,7 @@ INST_SRCS =
# Older llvm-config doesn't add -std=c++11
ObjectC++Flags $(INST_SRCS) : -std=c++11 `llvm-config --cxxflags` ;
+ObjectC++Flags $(INST_SRCS) : -DCITRUN_LIB=$(CITRUN_LIB) -DCITRUN_PATH=$(CITRUN_PATH) ;
LINKFLAGS on citrun-inst = `llvm-config --ldflags` ;
LLVM_LIBS = bitreader mcparser transformutils option ;