mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 22:23:22 +00:00
Code Activity

fix(api/python): make sure Z3 compiles using Python3

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2014-02-20 14:09:55 -08:00
parent 75bb495585
commit e077fc5cb4
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/mk_util.py
View file

@ -640,7 +640,7 @@ def is_CXX_gpp():
def is_clang_in_gpp_form(cc): def is_clang_in_gpp_form(cc):
version_string = subprocess.check_output([cc, '--version']) version_string = subprocess.check_output([cc, '--version'])
return version_string.find('clang') != -1 return str(version_string).find('clang') != -1
def is_CXX_clangpp(): def is_CXX_clangpp():
if is_compiler(CXX, 'g++'): if is_compiler(CXX, 'g++'):
@ -1437,7 +1437,7 @@ def mk_config():
'SO_EXT=.dll\n' 'SO_EXT=.dll\n'
'SLINK=cl\n' 'SLINK=cl\n'
'SLINK_OUT_FLAG=/Fe\n' 'SLINK_OUT_FLAG=/Fe\n'
'OS_DEFINES=/D _WINDOWS\n') 'OS_DEFINES=/D _WINDOWS\n')
extra_opt = '' extra_opt = ''
if GIT_HASH: if GIT_HASH:
extra_opt = '%s /D Z3GITHASH=%s' % (extra_opt, GIT_HASH) extra_opt = '%s /D Z3GITHASH=%s' % (extra_opt, GIT_HASH)
@ -1485,7 +1485,7 @@ def mk_config():
print('Java Compiler: %s' % JAVAC) print('Java Compiler: %s' % JAVAC)
else: else:
global CXX, CC, GMP, FOCI2, CPPFLAGS, CXXFLAGS, LDFLAGS, EXAMP_DEBUG_FLAG global CXX, CC, GMP, FOCI2, CPPFLAGS, CXXFLAGS, LDFLAGS, EXAMP_DEBUG_FLAG
OS_DEFINES = "" OS_DEFINES = ""
ARITH = "internal" ARITH = "internal"
check_ar() check_ar()
CXX = find_cxx_compiler() CXX = find_cxx_compiler()
@ -1508,7 +1508,7 @@ def mk_config():
SLIBEXTRAFLAGS = '%s %s' % (SLIBEXTRAFLAGS,FOCI2LIB) SLIBEXTRAFLAGS = '%s %s' % (SLIBEXTRAFLAGS,FOCI2LIB)
CPPFLAGS = '%s -D_FOCI2' % CPPFLAGS CPPFLAGS = '%s -D_FOCI2' % CPPFLAGS
else: else:
print "FAILED\n" print("FAILED\n")
FOCI2 = False FOCI2 = False
if GIT_HASH: if GIT_HASH:
CPPFLAGS = '%s -DZ3GITHASH=%s' % (CPPFLAGS, GIT_HASH) CPPFLAGS = '%s -DZ3GITHASH=%s' % (CPPFLAGS, GIT_HASH)
@ -1536,21 +1536,21 @@ def mk_config():
SLIBFLAGS = '-dynamiclib' SLIBFLAGS = '-dynamiclib'
elif sysname == 'Linux': elif sysname == 'Linux':
CXXFLAGS = '%s -fno-strict-aliasing -D_LINUX_' % CXXFLAGS CXXFLAGS = '%s -fno-strict-aliasing -D_LINUX_' % CXXFLAGS
OS_DEFINES = '-D_LINUX' OS_DEFINES = '-D_LINUX'
SO_EXT = '.so' SO_EXT = '.so'
LDFLAGS = '%s -lrt' % LDFLAGS LDFLAGS = '%s -lrt' % LDFLAGS
SLIBFLAGS = '-shared' SLIBFLAGS = '-shared'
SLIBEXTRAFLAGS = '%s -lrt' % SLIBEXTRAFLAGS SLIBEXTRAFLAGS = '%s -lrt' % SLIBEXTRAFLAGS
elif sysname == 'FreeBSD': elif sysname == 'FreeBSD':
CXXFLAGS = '%s -fno-strict-aliasing -D_FREEBSD_' % CXXFLAGS CXXFLAGS = '%s -fno-strict-aliasing -D_FREEBSD_' % CXXFLAGS
OS_DEFINES = '-D_FREEBSD_' OS_DEFINES = '-D_FREEBSD_'
SO_EXT = '.so' SO_EXT = '.so'
LDFLAGS = '%s -lrt' % LDFLAGS LDFLAGS = '%s -lrt' % LDFLAGS
SLIBFLAGS = '-shared' SLIBFLAGS = '-shared'
SLIBEXTRAFLAGS = '%s -lrt' % SLIBEXTRAFLAGS SLIBEXTRAFLAGS = '%s -lrt' % SLIBEXTRAFLAGS
elif sysname[:6] == 'CYGWIN': elif sysname[:6] == 'CYGWIN':
CXXFLAGS = '%s -D_CYGWIN -fno-strict-aliasing' % CXXFLAGS CXXFLAGS = '%s -D_CYGWIN -fno-strict-aliasing' % CXXFLAGS
OS_DEFINES = '-D_CYGWIN' OS_DEFINES = '-D_CYGWIN'
SO_EXT = '.dll' SO_EXT = '.dll'
SLIBFLAGS = '-shared' SLIBFLAGS = '-shared'
else: else:
@ -1586,7 +1586,7 @@ def mk_config():
config.write('SLINK_FLAGS=%s\n' % SLIBFLAGS) config.write('SLINK_FLAGS=%s\n' % SLIBFLAGS)
config.write('SLINK_EXTRA_FLAGS=%s\n' % SLIBEXTRAFLAGS) config.write('SLINK_EXTRA_FLAGS=%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():
print('Host platform: %s' % sysname) print('Host platform: %s' % sysname)
print('C++ Compiler: %s' % CXX) print('C++ Compiler: %s' % CXX)

2
src/api/python/z3.py
View file

@ -586,7 +586,7 @@ class FuncDeclRef(AstRef):
return Z3_func_decl_to_ast(self.ctx_ref(), self.ast) return Z3_func_decl_to_ast(self.ctx_ref(), self.ast)
def as_func_decl(self): def as_func_decl(self):
return self.ast return self.ast
def name(self): def name(self):
"""Return the name of the function declaration `self`. """Return the name of the function declaration `self`.