From 9e34872e8f79c52a6f35ed5fa945bf6a6aa5f755 Mon Sep 17 00:00:00 2001 From: Zachary Kincaid Date: Sun, 4 Oct 2015 10:10:53 -0400 Subject: [PATCH] For ocamlfind install, set rpath to package directory if stublibs does not exist --- scripts/mk_util.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/mk_util.py b/scripts/mk_util.py index ee2fefb43..33b79bba5 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -1497,8 +1497,13 @@ class MLComponent(Component): print ('ocamlfind destdir=%s' % ocamlfind_destdir) t.close() rmf('output') - out.write("-rpath %s " % os.path.join(ocamlfind_destdir, 'stublibs')) - out.write("-L%s" % os.path.join(ocamlfind_destdir, 'stublibs')) + # DLLs are installed into stublibs if it exists, Z3 if not + if os.path.exists(os.path.join(ocamlfind_destdir, 'stublibs')): + dll_path = os.path.join(ocamlfind_destdir, 'stublibs') + else: + dll_path = os.path.join(ocamlfind_destdir, 'Z3') + out.write("-rpath %s " % dll_path) + out.write("-L%s" % dll_path) for m in modules: out.write(' %s' % (os.path.join(sub_dir, m+'.ml')))