From 6f04d98497252fb6a5bc9af6265417f8b75eb791 Mon Sep 17 00:00:00 2001
From: Daniel Kroening <kroening@cs.ox.ac.uk>
Date: Sat, 26 May 2018 22:44:52 +0100
Subject: [PATCH] fix ordering problem in solvers/Makefile

---
 src/common           | 5 -----
 src/config.inc       | 5 +++++
 src/solvers/Makefile | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/common b/src/common
index 81ede8836ab..9f83c46e17e 100644
--- a/src/common
+++ b/src/common
@@ -158,11 +158,6 @@ else
   $(error Invalid setting for BUILD_ENV: $(BUILD_ENV_))
 endif
 
-# select default solver to be minisat2 if no other is specified
-ifeq ($(BOOLEFORCE)$(CHAFF)$(GLUCOSE)$(IPASIR)$(LINGELING)$(MINISAT)$(MINISAT2)$(PICOSAT)$(CADICAL),)
-  MINISAT2 = ../../minisat-2.2.1
-endif
-
 ifneq ($(IPASIR),)
   CP_CXXFLAGS += -DHAVE_IPASIR
 endif
diff --git a/src/config.inc b/src/config.inc
index 1bbaee22575..0f79c2cb2fe 100644
--- a/src/config.inc
+++ b/src/config.inc
@@ -30,6 +30,11 @@ endif
 # when linking against an IPASIR solver.
 LIBSOLVER =
 
+# select default solver to be minisat2 if no other is specified
+ifeq ($(BOOLEFORCE)$(CHAFF)$(GLUCOSE)$(IPASIR)$(LINGELING)$(MINISAT)$(MINISAT2)$(PICOSAT)$(CADICAL),)
+  MINISAT2 = ../../minisat-2.2.1
+endif
+
 ifneq ($(PICOSAT),)
   CP_CXXFLAGS += -DSATCHECK_PICOSAT
 endif
diff --git a/src/solvers/Makefile b/src/solvers/Makefile
index 506c487150e..4923507b15a 100644
--- a/src/solvers/Makefile
+++ b/src/solvers/Makefile
@@ -1,5 +1,4 @@
 include ../config.inc
-include ../common
 
 ifneq ($(CHAFF),)
   CHAFF_SRC=sat/satcheck_zchaff.cpp sat/satcheck_zcore.cpp
@@ -195,6 +194,8 @@ SRC = $(BOOLEFORCE_SRC) \
       smt2/smt2irep.cpp \
       # Empty last line
 
+include ../common
+
 INCLUDES += -I .. \
   $(CHAFF_INCLUDE) $(BOOLEFORCE_INCLUDE) $(MINISAT_INCLUDE) $(MINISAT2_INCLUDE) \
   $(IPASIR_INCLUDE) \