From ceabafa01cdbb66c6b6c465fd62e5c8c6f87d774 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 4 Dec 2014 14:11:19 +0000 Subject: [PATCH] ML API: build fixes Signed-off-by: Christoph M. Wintersteiger --- scripts/mk_util.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/mk_util.py b/scripts/mk_util.py index bd60feaa8..38cbb32f5 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -1434,8 +1434,8 @@ class MLComponent(Component): out.write('%s:' % (os.path.join(sub_dir, "z3.cmxa"))) for m in modules: out.write(' %s.cmi' % (os.path.join(sub_dir, m))) - out.write(' %s.cmx' % (os.path.join(sub_dir, m))) - out.write(' %s.cmo' % (os.path.join(sub_dir, m))) + # out.write(' %s.cmx' % (os.path.join(sub_dir, m))) + # out.write(' %s.cmo' % (os.path.join(sub_dir, m))) out.write('%s/z3native_stubs.o\n' % (sub_dir)) out.write('\tcd %s ; ocamlmklib -verbose -o z3' % (sub_dir)) for m in modules: @@ -1453,11 +1453,15 @@ class MLComponent(Component): for m in modules: out.write(' %s.cma' % (os.path.join(sub_dir, m))) out.write(' %s.cmxa' % (os.path.join(sub_dir, m))) - out.write(' %s.cmxx' % (os.path.join(sub_dir, m))) - out.write(' %s.cmi' % (os.path.join(sub_dir, m))) out.write(' %s.cmx' % (os.path.join(sub_dir, m))) + out.write(' %s.cmxs' % (os.path.join(sub_dir, m))) + out.write(' %s.cmi' % (os.path.join(sub_dir, m))) out.write(' %s' % ((os.path.join(sub_dir, 'libz3$(LIB_EXT)')))) - out.write(' %s' % ((os.path.join(sub_dir, 'dllz3$(SO_EXT)')))) + out.write(' %s' % ((os.path.join(sub_dir, 'dllz3')))) + if IS_WINDOWS: + out.write('.lib') + else: + out.write('.so') # .so also on OSX! out.write('\n\n')