about summary refs log tree commit diff homepage
path: root/Makefile.common
diff options
context:
space:
mode:
authorCristian Cadar <cristic@cs.stanford.edu>2012-07-31 17:21:30 +0000
committerCristian Cadar <cristic@cs.stanford.edu>2012-07-31 17:21:30 +0000
commitc582aa704b9f0d2729e76251aeb4676d4cb866a6 (patch)
treea8303928c18d72cad31f08cb07407ec080e9949d /Makefile.common
parent1fdb4ef41ea8a87225f751fa87534c5ac1751d40 (diff)
downloadklee-c582aa704b9f0d2729e76251aeb4676d4cb866a6.tar.gz
Patch by Dan Liew that removes our internal copy of STP, and makes the --with-stp option mandatory:
"1. At configure time the --with-stp= option is now mandatory.
 2. The HAVE_EXT_STP macro has been removed.
 3. The ENABLE_EXT_STP autoconf replacement variable has been removed and consequently the Makefile variable of the same name has been removed."



git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@161055 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common9
1 files changed, 2 insertions, 7 deletions
diff --git a/Makefile.common b/Makefile.common
index c458f600..bf99b1f3 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -29,13 +29,8 @@ endif
 # Needed to build runtime library using clang (gnu89 is the gcc default)
 C.Flags += -std=gnu89
 
-ifeq ($(ENABLE_EXT_STP),1)
-  LD.Flags += -L$(STP_ROOT)/lib
-  CXX.Flags += -I$(STP_ROOT)/include
-else
-  LD.Flags += -L$(PROJ_SRC_ROOT)/stp/lib
-  CXX.Flags += -I$(PROJ_SRC_ROOT)/stp/include
-endif
+LD.Flags += -L$(STP_ROOT)/lib
+CXX.Flags += -I$(STP_ROOT)/include
 CXX.Flags += -DKLEE_DIR=\"$(PROJ_OBJ_ROOT)\" -DKLEE_LIB_DIR=\"$(PROJ_libdir)\"
 
 # For STP.