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

Fixing new build system for OSX

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@z3-mac.local>
This commit is contained in:
Leonardo de Moura 2012-10-26 18:28:49 +01:00
parent bf27090641
commit deb5ee395a
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -93,7 +93,7 @@ AC_PROG_GREP
AC_PROG_SED AC_PROG_SED
# Sets OPENMP_CFLAGS # Sets OPENMP_CFLAGS
AC_OPENMP m4_ifdef([AC_OPENMP], [AC_OPENMP])
AR=ar AR=ar
AC_SUBST(AR) AC_SUBST(AR)

6
scripts/config-debug.mk.in
View file

@ -2,7 +2,7 @@
CXX=@CXX@ CXX=@CXX@
CXXFLAGS=@CPPFLAGS@ @CXXFLAGS@ -DZ3DEBUG -D_TRACE -c -g -Wall -fopenmp -msse -msse2 -mfpmath=sse CXXFLAGS=@CPPFLAGS@ @CXXFLAGS@ -DZ3DEBUG -D_TRACE -c -g -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
AR=@AR@ AR=@AR@
@ -11,9 +11,9 @@ AR_OUTFLAG=
EXE_EXT= EXE_EXT=
LINK=@CXX@ LINK=@CXX@
LINK_FLAGS=-lpthread -fopenmp LINK_FLAGS=-lpthread -fopenmp
LINK_OUT_FLAG=-o LINK_OUT_FLAG=-o
SO_EXT=@SO_EXT@ SO_EXT=@SO_EXT@
SLINK=@CXX@ SLINK=@CXX@
SLINK_FLAGS=@SLIBFLAGS@ SLINK_FLAGS=@SLIBFLAGS@
SLINK_EXTRA_FLAGS=@SLIBEXTRAFLAGS@ SLINK_EXTRA_FLAGS=@SLIBEXTRAFLAGS@
SLINK_OUT_FLAG=-o SLINK_OUT_FLAG=-o

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

@ -2,7 +2,7 @@
CXX=@CXX@ CXX=@CXX@
CXXFLAGS=@CPPFLAGS@ @CXXFLAGS@ -c -O3 -fomit-frame-pointer -fopenmp -msse -msse2 -mfpmath=sse CXXFLAGS=@CPPFLAGS@ @CXXFLAGS@ -c -O3 -fomit-frame-pointer -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
AR=@AR@ AR=@AR@
@ -11,9 +11,9 @@ AR_OUTFLAG=
EXE_EXT= EXE_EXT=
LINK=@CXX@ LINK=@CXX@
LINK_FLAGS=-lpthread -fopenmp LINK_FLAGS=-lpthread -fopenmp
LINK_OUT_FLAG=-o LINK_OUT_FLAG=-o
SO_EXT=@SO_EXT@ SO_EXT=@SO_EXT@
SLINK=@CXX@ SLINK=@CXX@
SLINK_FLAGS=@SLIBFLAGS@ SLINK_FLAGS=@SLIBFLAGS@
SLINK_EXTRA_FLAGS=@SLIBEXTRAFLAGS@ SLINK_EXTRA_FLAGS=@SLIBEXTRAFLAGS@
SLINK_OUT_FLAG=-o SLINK_OUT_FLAG=-o

2
src/util/symbol.h
View file

@ -56,7 +56,9 @@ public:
explicit symbol(char const * d); explicit symbol(char const * d);
explicit symbol(unsigned idx): explicit symbol(unsigned idx):
m_data(BOXTAGINT(char const *, idx, 1)) { m_data(BOXTAGINT(char const *, idx, 1)) {
#ifndef _AMD64_
SASSERT(idx < (SIZE_MAX >> PTR_ALIGNMENT)); SASSERT(idx < (SIZE_MAX >> PTR_ALIGNMENT));
#endif
} }
static symbol dummy() { return m_dummy; } static symbol dummy() { return m_dummy; }
static const symbol null; static const symbol null;