From cf04bf9959026fab5554403f22effa42e2ee4062 Mon Sep 17 00:00:00 2001 From: Leonardo de Moura Date: Fri, 26 Oct 2012 19:37:18 +0100 Subject: [PATCH] OSX again Signed-off-by: Leonardo de Moura --- scripts/mk_make.py | 2 +- scripts/mk_util.py | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/mk_make.py b/scripts/mk_make.py index f60be32d6..79011df36 100644 --- a/scripts/mk_make.py +++ b/scripts/mk_make.py @@ -63,7 +63,7 @@ add_lib('api', ['portfolio', 'user_plugin']) add_exe('shell', ['api', 'sat', 'extra_cmds'], exe_name='z3') add_exe('test', ['api', 'fuzzing'], exe_name='test-z3') API_files = ['z3_api.h'] -add_dll('api_dll', ['sat', 'extra_cmds'], 'api/dll', reexports=['api'], dll_name='z3', export_files=API_files) +add_dll('api_dll', ['api', 'sat', 'extra_cmds'], 'api/dll', reexports=['api'], dll_name='z3', export_files=API_files) add_dot_net_dll('dotnet', ['api_dll'], 'bindings/dotnet/Microsoft.Z3', dll_name='Microsoft.Z3', assembly_info_dir='Properties') add_dot_net_dll('dotnetV3', ['api_dll'], 'bindings/dotnet/Microsoft.Z3V3', dll_name='Microsoft.Z3V3') set_python_dir('bindings/python') diff --git a/scripts/mk_util.py b/scripts/mk_util.py index 97eac9313..2e2ab46f9 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -341,10 +341,6 @@ class DLLComponent(Component): dll_name = name self.dll_name = dll_name self.export_files = export_files - new_deps = find_all_deps(name, reexports) - for new_dep in new_deps: - if not new_dep in reexports: - self.deps.append(new_dep) self.reexports = reexports def mk_makefile(self, out): @@ -371,8 +367,9 @@ class DLLComponent(Component): out.write(' ') out.write(obj) for dep in deps: - c_dep = _Name2Component[dep] - out.write(' %s/%s$(LIB_EXT)' % (c_dep.build_dir, c_dep.name)) + if not dep in self.reexports: + c_dep = _Name2Component[dep] + out.write(' %s/%s$(LIB_EXT)' % (c_dep.build_dir, c_dep.name)) out.write('\n') out.write('\t$(LINK) $(SLINK_OUT_FLAG)%s $(SLINK_FLAGS)' % dllfile) for obj in objs: