about summary refs log tree commit diff homepage
path: root/Makefile.common
diff options
context:
space:
mode:
authorCristian Cadar <c.cadar@imperial.ac.uk>2013-12-22 07:17:25 -0800
committerCristian Cadar <c.cadar@imperial.ac.uk>2013-12-22 07:17:25 -0800
commitc26accf1c3fe572fdcb5e21d74857b836df1efbf (patch)
tree645ceda7642bb3c4acc1e701a8869809b28e1683 /Makefile.common
parentc23df4c98173f0733945f3d14009cdd5ffbee36b (diff)
parent2f6e89baf9cd5f5292cd0aa6047144920a564202 (diff)
downloadklee-c26accf1c3fe572fdcb5e21d74857b836df1efbf.tar.gz
Merge pull request #78 from delcypher/fix_klee_install
Fixes klee install.  Adds support for passing libc.a files to --with-uclibc.
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common10
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common
index 3f60bbec..e5e3c18a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -30,9 +30,17 @@ endif
 # Needed to build runtime library using clang (gnu89 is the gcc default)
 C.Flags += -std=gnu89
 
+# This is filename that KLEE will look for when trying to load klee-uclibc
+KLEE_UCLIBC_BCA_NAME="klee-uclibc.bca"
+
 LD.Flags += -L$(STP_ROOT)/lib
 CXX.Flags += -I$(STP_ROOT)/include
-CXX.Flags += -DKLEE_DIR=\"$(PROJ_OBJ_ROOT)\" -DKLEE_LIB_DIR=\"$(PROJ_libdir)\"
+CXX.Flags += -DKLEE_DIR=\"$(PROJ_OBJ_ROOT)\" -DKLEE_INSTALL_BIN_DIR=\"$(PROJ_bindir)\"
+CXX.Flags += -DKLEE_INSTALL_LIB_DIR=\"$(PROJ_libdir)\"
+
+ifeq ($(ENABLE_UCLIBC),1)
+	CXX.Flags += -DKLEE_UCLIBC_BCA_NAME=\"$(KLEE_UCLIBC_BCA_NAME)\"
+endif
 
 # For STP.
 CXX.Flags += -DEXT_HASH_MAP