commit af99222c38ae0e1e9e3683fbd1034e9cd0408844
parent 6c802f6367d41c866c2b95e39cc680b552ae9e53
Author: Kyle Milz <kyle@0x30.net>
Date: Wed, 21 Dec 2016 17:05:59 -0700
move stuff from Jamrules
Diffstat:
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/Jamrules.in b/Jamrules.in
@@ -1,21 +1,4 @@
-#
-# Knowing the absolute path to citrun resources is necessary because:
-# - instrumented programs must be linked to the runtime library
-# - the PATH compiler interception mechanism needs to remove itself from PATH
-#
-# If PREFIX is set we're building a package, so trust that will be the final
-# (after installation) location.
-#
-if $(PREFIX) {
- echo ...build C It Run (Release) on $(OS)... ;
- CITRUN_SHARE = $(PREFIX)/share/citrun ;
-}
-else {
- echo ...build C It Run (Debug) on $(OS)... ;
- #CITRUN_SHARE = "`readlink -f $(TOP)/src`" ;
- CITRUN_SHARE = "`cd $(TOP)/src && pwd`" ;
- CFLAGS += -Wall -g ;
-}
+echo ...build C It Run on $(OS)... ;
CCFLAGS += $(CFLAGS) ;
C++FLAGS += -std=c++11 -fno-exceptions -fno-rtti $(CFLAGS) ;
diff --git a/configure b/configure
@@ -24,9 +24,12 @@ cp Jamrules.in Jamrules
cat <<EOF >> Jamrules
# Automatically generated on `date`
+CITRUN_SRCDIR = "`pwd`/src" ;
+
GL_CFLAGS = "`pkg-config --cflags glfw3 glew freetype2`" ;
GL_LIBS = "`pkg-config --libs glfw3 glew freetype2`" ;
GLTEST_LIBS = "`pkg-config --libs osmesa`" ;
+
INST_CFLAGS = "`llvm-config --cxxflags`" ;
INST_LDFLAGS = "`llvm-config --ldflags`" ;
INST_LIBS = "`llvm-config --libs bitreader mcparser transformutils option`" ;
diff --git a/src/Jamfile b/src/Jamfile
@@ -1,4 +1,19 @@
SubDir TOP src ;
+#
+# Knowing the absolute path to citrun resources is necessary because:
+# - instrumented programs must be linked to the runtime library
+# - the PATH compiler interception mechanism needs to remove itself from PATH
+#
+# If PREFIX is set we're building a package, so trust that will be the final
+# (after installation) location.
+#
+if $(PREFIX) {
+ CITRUN_SHARE = $(PREFIX)/share/citrun ;
+}
+else {
+ CITRUN_SHARE = $(CITRUN_SRCDIR) ;
+ CFLAGS += -Wall -g ;
+}
# Do a string replacement on the first argument.
actions ReplaceTokens
