mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-04 13:29:11 +00:00
Code Activity

Improving Z3 build for cygwin. Fixed sets deprecated warning.

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2012-10-24 17:53:37 -07:00
parent d7930da9a8
commit 1669b42e0a
3 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
configure.ac
View file

@ -123,11 +123,10 @@ AS_IF([test "$host_os" = "Darwin"], [
PLATFORM=win PLATFORM=win
SO_EXT=.dll SO_EXT=.dll
LDFLAGS= LDFLAGS=
SLIBFLAGS="-shared -fopenmp" SLIBFLAGS="-shared -fopenmp -Wl,--whole-archive"
SLIBEXTRAFLAGS="" SLIBEXTRAFLAGS="-Wl,--no-whole-archive"
COMP_VERSIONS= COMP_VERSIONS=
STATIC_FLAGS=-static CXXFLAGS+=" -D_CYGWIN -fno-strict-aliasing"
CXXFLAGS+=" -D_CYGWIN"
], ],
[ [
AC_MSG_ERROR([Unknown host platform: $host_os]) AC_MSG_ERROR([Unknown host platform: $host_os])
@ -145,16 +144,14 @@ AC_CHECK_SIZEOF(int *)
if test $ac_cv_sizeof_int_p -eq 8; then if test $ac_cv_sizeof_int_p -eq 8; then
dnl In 64-bit systems we have to compile using -fPIC dnl In 64-bit systems we have to compile using -fPIC
CXXFLAGS="-fPIC" CXXFLAGS+=" -fPIC"
CPPFLAGS="$CPPFLAGS -D_AMD64_" CPPFLAGS+=" -D_AMD64_"
dnl Only enable use of thread local storage for 64-bit Linux. It is disabled for OSX and 32-bit Linux dnl Only enable use of thread local storage for 64-bit Linux. It is disabled for OSX and 32-bit Linux
if test $PLATFORM = "linux"; then if test $PLATFORM = "linux"; then
CPPFLAGS="$CPPFLAGS -D_USE_THREAD_LOCAL" CPPFLAGS+=" -D_USE_THREAD_LOCAL"
fi fi
EXTRA_LIBS=""
IS_X64="yes" IS_X64="yes"
else else
CXXFLAGS=""
IS_X64="no" IS_X64="no"
fi fi

2
scripts/config-release.mk.in
View file

@ -1,7 +1,7 @@
CXX=@CXX@ CXX=@CXX@
CXXFLAGS=@CPPFLAGS@ @CXXFLAGS@ -c -O3 -fomit-frame-pointer -Wall -fopenmp -msse -msse2 -mfpmath=sse -fPIC CXXFLAGS=@CPPFLAGS@ @CXXFLAGS@ -c -O3 -fomit-frame-pointer -Wall -fopenmp -msse -msse2 -mfpmath=sse
CXX_OUT_FLAG=-o CXX_OUT_FLAG=-o
OBJ_EXT=.o OBJ_EXT=.o
LIB_EXT=.a LIB_EXT=.a

7
scripts/mk_util.py
View file

@ -8,7 +8,6 @@
############################################ ############################################
import os import os
import glob import glob
import sets
import re import re
import getopt import getopt
import sys import sys
@ -118,9 +117,9 @@ def mk_fresh_name(prefix):
_Id = 0 _Id = 0
_Components = [] _Components = []
_ComponentNames = sets.Set() _ComponentNames = set()
_Name2Component = {} _Name2Component = {}
_Processed_Headers = sets.Set() _Processed_Headers = set()
def get_cpp_files(path): def get_cpp_files(path):
return filter(lambda f: f.endswith('.cpp'), os.listdir(path)) return filter(lambda f: f.endswith('.cpp'), os.listdir(path))
@ -315,7 +314,7 @@ class DLLComponent(Component):
if IS_WINDOW: if IS_WINDOW:
dllfile = '%s$(SO_EXT)' % self.dll_name dllfile = '%s$(SO_EXT)' % self.dll_name
else: else:
dllfile = '%libs$(SO_EXT)' % self.dll_name dllfile = 'lib%s$(SO_EXT)' % self.dll_name
out.write('%s:' % dllfile) out.write('%s:' % dllfile)
deps = sort_components(self.deps) deps = sort_components(self.deps)
objs = [] objs = []