mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-09 15:43:25 +00:00
Code Activity

Bugfixes for the build on new OSX machines (XCode 5.0 on).

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2014-01-21 17:06:13 +00:00
parent d548c51a98
commit 73a1dddc45
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/mk_util.py
View file

@ -638,7 +638,19 @@ def is_compiler(given, expected):
def is_CXX_gpp(): def is_CXX_gpp():
return is_compiler(CXX, 'g++') return is_compiler(CXX, 'g++')
def is_clang_in_gpp_form(cc):
outf = open('clang_version', 'rw')
subprocess.call([cc, '--version'], stdout=outf, stderr=outf)
outf.seek(0)
version_string = outf.read()
contains_clang = version_string.find('clang') != -1
outf.close()
os.remove('clang_version')
return contains_clang
def is_CXX_clangpp(): def is_CXX_clangpp():
if is_compiler(CXX, 'g++'):
return is_clang_in_gpp_form(CXX)
return is_compiler(CXX, 'clang++') return is_compiler(CXX, 'clang++')
def get_cpp_files(path): def get_cpp_files(path):

5
src/util/hwf.cpp
View file

@ -49,8 +49,11 @@ Revision History:
// clear to the compiler what instructions should be used. E.g., for sqrt(), the Windows compiler selects // clear to the compiler what instructions should be used. E.g., for sqrt(), the Windows compiler selects
// the x87 FPU, even when /arch:SSE2 is on. // the x87 FPU, even when /arch:SSE2 is on.
// Luckily, these are kind of standardized, at least for Windows/Linux/OSX. // Luckily, these are kind of standardized, at least for Windows/Linux/OSX.
#ifdef __clang__
#undef USE_INTRINSICS
#else
#include <emmintrin.h> #include <emmintrin.h>
#endif
hwf_manager::hwf_manager() : hwf_manager::hwf_manager() :
m_mpz_manager(m_mpq_manager) m_mpz_manager(m_mpq_manager)