From 4fe4db6657d806bc3444aca4c9de7d6fc127217a Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Tue, 1 Mar 2016 17:34:45 +0000 Subject: [PATCH 1/2] build fix for static libray on Windows --- scripts/mk_util.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/mk_util.py b/scripts/mk_util.py index e32c9c3dd..a02a9b40f 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -1261,13 +1261,16 @@ class DLLComponent(Component): out.write(' /DEF:%s.def' % os.path.join(self.to_src_dir, self.name)) out.write('\n') if self.static: - self.mk_static(out) - libfile = '%s$(LIB_EXT)' % self.dll_name + if IS_WINDOWS: + libfile = '%s-static$(LIB_EXT)' % self.dll_name + else: + libfile = '%s$(LIB_EXT)' % self.dll_name + self.mk_static(out, libfile) out.write('%s: %s %s\n\n' % (self.name, self.dll_file(), libfile)) else: out.write('%s: %s\n\n' % (self.name, self.dll_file())) - def mk_static(self, out): + def mk_static(self, out, libfile): # generate rule for lib objs = [] for cppfile in get_cpp_files(self.src_dir): @@ -1279,7 +1282,6 @@ class DLLComponent(Component): for cppfile in get_cpp_files(dep.src_dir): objfile = '%s$(OBJ_EXT)' % os.path.join(dep.build_dir, os.path.splitext(cppfile)[0]) objs.append(objfile) - libfile = '%s$(LIB_EXT)' % self.dll_name out.write('%s:' % libfile) for obj in objs: out.write(' ') From 0cb8193cdd2f2e5ae88fbc1565ddf00eaa323067 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Tue, 1 Mar 2016 17:42:33 +0000 Subject: [PATCH 2/2] logic fix --- src/api/api_numeral.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/api_numeral.cpp b/src/api/api_numeral.cpp index 491d9f597..40ebcf652 100644 --- a/src/api/api_numeral.cpp +++ b/src/api/api_numeral.cpp @@ -68,10 +68,10 @@ extern "C" { (' ' == *m) || ('\n' == *m) || ('.' == *m) || ('e' == *m) || ('E' == *m) || - (is_float && - ('p' == *m) || - ('P' == *m) || - ('+' == *m)))) { + (is_float && + (('p' == *m) || + ('P' == *m) || + ('+' == *m))))) { SET_ERROR_CODE(Z3_PARSER_ERROR); return 0; }