mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-31 19:52:29 +00:00
Code Activity

move to zarith #2471

Browse source 
Signed-off-by: NikolajBjorner <nbjorner@microsoft.com>
This commit is contained in:
NikolajBjorner 2019-09-23 02:45:20 -07:00
parent 0b06a9b5d8
commit 6b117c0b2c
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scripts/mk_util.py
View file

@ -1955,9 +1955,8 @@ class MLComponent(Component):
OCAML_FLAGS += '-g' OCAML_FLAGS += '-g'
if OCAMLFIND: if OCAMLFIND:
# Load Big_int, which is no longer part of the standard library, via the num package: https://github.com/ocaml/num OCAMLCF = OCAMLC + ' ' + 'ocamlc -package zarith' + ' ' + OCAML_FLAGS
OCAMLCF = OCAMLFIND + ' ' + 'ocamlc -package num' + ' ' + OCAML_FLAGS OCAMLOPTF = OCAMLOPT + ' ' + 'ocamlopt -package zarith' + ' ' + OCAML_FLAGS
OCAMLOPTF = OCAMLFIND + ' ' + 'ocamlopt -package num' + ' ' + OCAML_FLAGS
else: else:
OCAMLCF = OCAMLC + ' ' + OCAML_FLAGS OCAMLCF = OCAMLC + ' ' + OCAML_FLAGS
OCAMLOPTF = OCAMLOPT + ' ' + OCAML_FLAGS OCAMLOPTF = OCAMLOPT + ' ' + OCAML_FLAGS
@ -2285,7 +2284,7 @@ class MLExampleComponent(ExampleComponent):
out.write('\t%s ' % OCAMLC) out.write('\t%s ' % OCAMLC)
if DEBUG_MODE: if DEBUG_MODE:
out.write('-g ') out.write('-g ')
out.write('-custom -o ml_example.byte -I api/ml -cclib "-L. -lz3" nums.cma z3ml.cma') out.write('-custom -o ml_example.byte -I -zarith -I api/ml -cclib "-L. -lz3" zarith.cma z3ml.cma')
for mlfile in get_ml_files(self.ex_dir): for mlfile in get_ml_files(self.ex_dir):
out.write(' %s/%s' % (self.to_ex_dir, mlfile)) out.write(' %s/%s' % (self.to_ex_dir, mlfile))
out.write('\n') out.write('\n')
@ -2296,7 +2295,7 @@ class MLExampleComponent(ExampleComponent):
out.write('\t%s ' % OCAMLOPT) out.write('\t%s ' % OCAMLOPT)
if DEBUG_MODE: if DEBUG_MODE:
out.write('-g ') out.write('-g ')
out.write('-o ml_example$(EXE_EXT) -I api/ml -cclib "-L. -lz3" nums.cmxa z3ml.cmxa') out.write('-o ml_example$(EXE_EXT) -I -zarith -I api/ml -cclib "-L. -lz3" zarith.cmxa z3ml.cmxa')
for mlfile in get_ml_files(self.ex_dir): for mlfile in get_ml_files(self.ex_dir):
out.write(' %s/%s' % (self.to_ex_dir, mlfile)) out.write(' %s/%s' % (self.to_ex_dir, mlfile))
out.write('\n') out.write('\n')
@ -2619,11 +2618,11 @@ def mk_config():
config.write('LINK=%s\n' % CXX) config.write('LINK=%s\n' % CXX)
config.write('LINK_FLAGS=\n') config.write('LINK_FLAGS=\n')
config.write('LINK_OUT_FLAG=-o \n') config.write('LINK_OUT_FLAG=-o \n')
config.write('LINK_EXTRA_FLAGS=-lpthread %s\n' % LDFLAGS) config.write('LINK_EXTRA_FLAGS=-Wl,--whole-archive -lpthread -Wl,--no-whole-archive %s\n' % LDFLAGS)
config.write('SO_EXT=%s\n' % SO_EXT) config.write('SO_EXT=%s\n' % SO_EXT)
config.write('SLINK=%s\n' % CXX) config.write('SLINK=%s\n' % CXX)
config.write('SLINK_FLAGS=%s\n' % SLIBFLAGS) config.write('SLINK_FLAGS=%s\n' % SLIBFLAGS)
config.write('SLINK_EXTRA_FLAGS=-lpthread %s\n' % SLIBEXTRAFLAGS) config.write('SLINK_EXTRA_FLAGS=-Wl,--whole-archive -lpthread -Wl,--no-whole-archive %s\n' % SLIBEXTRAFLAGS)
config.write('SLINK_OUT_FLAG=-o \n') config.write('SLINK_OUT_FLAG=-o \n')
config.write('OS_DEFINES=%s\n' % OS_DEFINES) config.write('OS_DEFINES=%s\n' % OS_DEFINES)
if is_verbose(): if is_verbose():

2
src/api/ml/META.in
View file

@ -1,7 +1,7 @@
# META file for the "z3" package: # META file for the "z3" package:
version = "@VERSION@" version = "@VERSION@"
description = "Z3 Theorem Prover (OCaml API)" description = "Z3 Theorem Prover (OCaml API)"
requires = "num threads" requires = "zarith threads"
archive(byte) = "z3ml.cma" archive(byte) = "z3ml.cma"
archive(native) = "z3ml.cmxa" archive(native) = "z3ml.cmxa"
archive(byte,plugin) = "z3ml.cma" archive(byte,plugin) = "z3ml.cma"