Skip to content

Commit e32b767

Browse files
committed
Update patch to use renamed VERSION.txt
1 parent 6dd6213 commit e32b767

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

scripts/cadical-1.4.1-patch

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
diff --git a/scripts/make-build-header.sh b/scripts/make-build-header.sh
2+
index e8f6746..1290024 100755
3+
--- a/scripts/make-build-header.sh
4+
+++ b/scripts/make-build-header.sh
5+
@@ -20,7 +20,7 @@ warning () {
6+
7+
#--------------------------------------------------------------------------#
8+
9+
-[ ! -f VERSION -a ! -f ../VERSION ] && \
10+
+[ ! -f VERSION.txt -a ! -f ../VERSION.txt ] && \
11+
die "needs to be called from build sub-directory"
12+
13+
[ -f makefile ] || \
14+
@@ -29,7 +29,7 @@ warning "could not find 'makefile'"
15+
#--------------------------------------------------------------------------#
16+
# The version.
17+
#
18+
-VERSION="`cat ../VERSION`"
19+
+VERSION="`cat ../VERSION.txt`"
20+
if [ x"$VERSION" = x ]
21+
then
22+
warning "could not determine 'VERSION'"
123
diff --git a/src/lookahead.cpp b/src/lookahead.cpp
224
index 9e8a16b..3d5721a 100644
325
--- a/src/lookahead.cpp

src/solvers/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ solvers$(LIBEXT): $(OBJ) $(SOLVER_LIB)
277277
$(LINKLIB)
278278

279279
../../cadical/build/libcadical$(LIBEXT):
280-
$(MAKE) $(MAKEARGS) -C $(CADICAL)/build libcadical.a CXX="$(CXX)" CXXFLAGS="$(CP_CXXFLAGS) -DNBUILD"
280+
$(MAKE) $(MAKEARGS) -C $(CADICAL)/build libcadical.a CXX="$(CXX)" CXXFLAGS="$(CP_CXXFLAGS)"
281281

282282
-include smt2/smt2_solver$(DEPEXT)
283283

0 commit comments

Comments
 (0)