diff -up cbmc-4.6-20131201svn/src/cbmc/Makefile.build cbmc-4.6-20131201svn/src/cbmc/Makefile
--- cbmc-4.6-20131201svn/src/cbmc/Makefile.build 2013-12-05 16:57:59.848821235 +0530
+++ cbmc-4.6-20131201svn/src/cbmc/Makefile 2013-12-05 16:58:18.806874197 +0530
@@ -22,7 +22,7 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
INCLUDES= -I ..
-LIBS =
+LIBS = -lminisat
include ../config.inc
include ../common
diff -up cbmc-4.6-20131201svn/src/common.build cbmc-4.6-20131201svn/src/common
--- cbmc-4.6-20131201svn/src/common.build 2013-12-05 16:58:30.472907110 +0530
+++ cbmc-4.6-20131201svn/src/common 2013-12-05 16:59:08.887018367 +0530
@@ -23,8 +23,8 @@ ifeq ($(BUILD_ENV_),MinGW)
else
EXEEXT =
endif
- CFLAGS ?= -Wall -O2
- CXXFLAGS ?= -Wall -O2
+ CFLAGS = ${RPM_OPT_FLAGS}
+ CXXFLAGS = ${RPM_OPT_FLAGS}
CP_CFLAGS = -MMD -MP
CP_CXXFLAGS = -MMD -MP -DSTL_HASH_TR1
#LINKFLAGS = -static
diff -up cbmc-4.6-20131201svn/src/config.inc.build cbmc-4.6-20131201svn/src/config.inc
--- cbmc-4.6-20131201svn/src/config.inc.build 2013-12-05 16:59:23.673062258 +0530
+++ cbmc-4.6-20131201svn/src/config.inc 2013-12-05 16:59:45.511128110 +0530
@@ -11,7 +11,7 @@ BUILD_ENV = AUTO
#CHAFF = ../../zChaff
#BOOLEFORCE = ../../booleforce-0.4
#MINISAT = ../../MiniSat-p_v1.14
-MINISAT2 = ../../minisat-2.2.0
+MINISAT2 = /usr/include/minisat
#GLUCOSE = ../../glucose2.2
#SMVSAT =
diff -up cbmc-4.6-20131201svn/src/goto-instrument/Makefile.build cbmc-4.6-20131201svn/src/goto-instrument/Makefile
--- cbmc-4.6-20131201svn/src/goto-instrument/Makefile.build 2013-12-05 17:13:11.341134375 +0530
+++ cbmc-4.6-20131201svn/src/goto-instrument/Makefile 2013-12-05 17:13:22.124253011 +0530
@@ -28,7 +28,7 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
INCLUDES= -I ..
-LIBS =
+LIBS = -lminisat
CLEANFILES = goto-instrument$(EXEEXT)
diff -up cbmc-4.6-20131201svn/src/solvers/Makefile.build cbmc-4.6-20131201svn/src/solvers/Makefile
--- cbmc-4.6-20131201svn/src/solvers/Makefile.build 2013-12-05 16:59:56.553161633 +0530
+++ cbmc-4.6-20131201svn/src/solvers/Makefile 2013-12-05 17:00:05.047187735 +0530
@@ -17,7 +17,7 @@ endif
ifneq ($(MINISAT2),)
MINISAT2_SRC=sat/satcheck_minisat2.cpp
MINISAT2_INCLUDE=-I $(MINISAT2)
- MINISAT2_LIB=$(MINISAT2)/simp/SimpSolver$(OBJEXT) $(MINISAT2)/core/Solver$(OBJEXT)
+# MINISAT2_LIB=$(MINISAT2)/simp/SimpSolver$(OBJEXT) $(MINISAT2)/core/Solver$(OBJEXT)
CP_CXXFLAGS += -DHAVE_MINISAT2 -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
override CXXFLAGS := $(filter-out -pedantic, $(CXXFLAGS))
endif