mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 20:18:18 +00:00
Code Activity

MSYS offers a MINGW shell as well. (uses different os.uname())

Browse source
This commit is contained in:
Paul Ehrlich 2017-11-01 12:02:48 +01:00
parent 24a44a0b29
commit 2a459c5ff6
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/mk_util.py
View file

@ -610,7 +610,7 @@ elif os.name == 'posix':
IS_CYGWIN=True IS_CYGWIN=True
if (CC != None and "mingw" in CC): if (CC != None and "mingw" in CC):
IS_CYGWIN_MINGW=True IS_CYGWIN_MINGW=True
elif os.uname()[0].startswith('MSYS_NT'): elif os.uname()[0].startswith('MSYS_NT') or os.uname()[0].startswith('MINGW'):
IS_MSYS2=True IS_MSYS2=True
if os.uname()[4] == 'x86_64': if os.uname()[4] == 'x86_64':
LINUX_X64=True LINUX_X64=True
@ -1240,7 +1240,7 @@ def get_so_ext():
sysname = os.uname()[0] sysname = os.uname()[0]
if sysname == 'Darwin': if sysname == 'Darwin':
return 'dylib' return 'dylib'
elif sysname == 'Linux' or sysname == 'FreeBSD' or sysname == 'OpenBSD' or sysname.startswith('MSYS_NT'): elif sysname == 'Linux' or sysname == 'FreeBSD' or sysname == 'OpenBSD' or sysname.startswith('MSYS_NT') or sysname.startswith('MINGW'):
return 'so' return 'so'
elif sysname == 'CYGWIN': elif sysname == 'CYGWIN':
return 'dll' return 'dll'
@ -1888,7 +1888,6 @@ class MLComponent(Component):
def _init_ocamlfind_paths(self): def _init_ocamlfind_paths(self):
""" """
Initialises self.destdir and self.ldconf Initialises self.destdir and self.ldconf
Do not call this from the MLComponent constructor because OCAMLFIND Do not call this from the MLComponent constructor because OCAMLFIND
has not been checked at that point has not been checked at that point
""" """
@ -2459,7 +2458,7 @@ def mk_config():
if sysname == 'Darwin': if sysname == 'Darwin':
SO_EXT = '.dylib' SO_EXT = '.dylib'
SLIBFLAGS = '-dynamiclib' SLIBFLAGS = '-dynamiclib'
elif sysname == 'Linux' or sysname.startswith('MSYS_NT'): elif sysname == 'Linux' or sysname.startswith('MSYS_NT') or sysname.startswith('MINGW'):
CXXFLAGS = '%s -D_LINUX_' % CXXFLAGS CXXFLAGS = '%s -D_LINUX_' % CXXFLAGS
OS_DEFINES = '-D_LINUX_' OS_DEFINES = '-D_LINUX_'
SO_EXT = '.so' SO_EXT = '.so'
@ -3173,7 +3172,6 @@ class MakeRuleCmd(object):
""" """
These class methods provide a convenient way to emit frequently These class methods provide a convenient way to emit frequently
needed commands used in Makefile rules needed commands used in Makefile rules
Note that several of the method are meant for use during ``make Note that several of the method are meant for use during ``make
install`` and ``make uninstall``. These methods correctly use install`` and ``make uninstall``. These methods correctly use
``$(PREFIX)`` and ``$(DESTDIR)`` and therefore are preferrable ``$(PREFIX)`` and ``$(DESTDIR)`` and therefore are preferrable
@ -3349,10 +3347,8 @@ def configure_file(template_file_path, output_file_path, substitutions):
Read a template file ``template_file_path``, perform substitutions Read a template file ``template_file_path``, perform substitutions
found in the ``substitutions`` dictionary and write the result to found in the ``substitutions`` dictionary and write the result to
the output file ``output_file_path``. the output file ``output_file_path``.
The template file should contain zero or more template strings of the The template file should contain zero or more template strings of the
form ``@NAME@``. form ``@NAME@``.
The substitutions dictionary maps old strings (without the ``@`` The substitutions dictionary maps old strings (without the ``@``
symbols) to their replacements. symbols) to their replacements.
""" """