From deb5ee395a473d6e4767524f1b9b94963a064b3f Mon Sep 17 00:00:00 2001
From: Leonardo de Moura <leonardo@microsoft.com>
Date: Fri, 26 Oct 2012 18:28:49 +0100
Subject: [PATCH] Fixing new build system for OSX

Signed-off-by: Leonardo de Moura <leonardo@z3-mac.local>
---
 configure.ac                 | 2 +-
 scripts/config-debug.mk.in   | 6 +++---
 scripts/config-release.mk.in | 6 +++---
 src/util/symbol.h            | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index d1fc84848..e7a6412d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,7 @@ AC_PROG_GREP
 AC_PROG_SED
 
 # Sets OPENMP_CFLAGS
-AC_OPENMP
+m4_ifdef([AC_OPENMP], [AC_OPENMP])
 
 AR=ar
 AC_SUBST(AR)
diff --git a/scripts/config-debug.mk.in b/scripts/config-debug.mk.in
index de807a217..ce2ba3837 100644
--- a/scripts/config-debug.mk.in
+++ b/scripts/config-debug.mk.in
@@ -2,7 +2,7 @@
 
 CXX=@CXX@
 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
 LIB_EXT=.a
 AR=@AR@
@@ -11,9 +11,9 @@ AR_OUTFLAG=
 EXE_EXT=
 LINK=@CXX@
 LINK_FLAGS=-lpthread -fopenmp
-LINK_OUT_FLAG=-o
+LINK_OUT_FLAG=-o 
 SO_EXT=@SO_EXT@
 SLINK=@CXX@
 SLINK_FLAGS=@SLIBFLAGS@
 SLINK_EXTRA_FLAGS=@SLIBEXTRAFLAGS@
-SLINK_OUT_FLAG=-o
\ No newline at end of file
+SLINK_OUT_FLAG=-o 
\ No newline at end of file
diff --git a/scripts/config-release.mk.in b/scripts/config-release.mk.in
index 74d388fec..903f50f58 100644
--- a/scripts/config-release.mk.in
+++ b/scripts/config-release.mk.in
@@ -2,7 +2,7 @@
 
 CXX=@CXX@
 CXXFLAGS=@CPPFLAGS@ @CXXFLAGS@ -c -O3 -fomit-frame-pointer -fopenmp -msse -msse2 -mfpmath=sse
-CXX_OUT_FLAG=-o
+CXX_OUT_FLAG=-o 
 OBJ_EXT=.o
 LIB_EXT=.a
 AR=@AR@
@@ -11,9 +11,9 @@ AR_OUTFLAG=
 EXE_EXT=
 LINK=@CXX@
 LINK_FLAGS=-lpthread -fopenmp
-LINK_OUT_FLAG=-o
+LINK_OUT_FLAG=-o 
 SO_EXT=@SO_EXT@
 SLINK=@CXX@
 SLINK_FLAGS=@SLIBFLAGS@
 SLINK_EXTRA_FLAGS=@SLIBEXTRAFLAGS@
-SLINK_OUT_FLAG=-o
\ No newline at end of file
+SLINK_OUT_FLAG=-o 
\ No newline at end of file
diff --git a/src/util/symbol.h b/src/util/symbol.h
index 5da44c52c..e32eeb55b 100644
--- a/src/util/symbol.h
+++ b/src/util/symbol.h
@@ -56,7 +56,9 @@ public:
     explicit symbol(char const * d);
     explicit symbol(unsigned idx):
         m_data(BOXTAGINT(char const *, idx, 1)) {
+#ifndef _AMD64_
         SASSERT(idx < (SIZE_MAX >> PTR_ALIGNMENT));
+#endif
     }
     static symbol dummy() { return m_dummy; }
     static const symbol null;