From: trevor_hansen <trevor_hansen@e59a4935-1847-0410-ae03-e826735625c1>
Date: Tue, 8 Feb 2011 12:00:08 +0000 (+0000)
Subject: Patch from Khoo Yit Phang.
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=3e093f13a3c7dd987e47b8965415b6c88da68289;p=francis%2Fstp.git

Patch from Khoo Yit Phang.
Drop support for building universal binaries on OS X, since it raises rather annoying build issues.



git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@1125 e59a4935-1847-0410-ae03-e826735625c1
---

diff --git a/scripts/Makefile.common b/scripts/Makefile.common
index 351c854..825eaa8 100644
--- a/scripts/Makefile.common
+++ b/scripts/Makefile.common
@@ -55,28 +55,10 @@ else
     LDFLAGS_BASE = -lstdc++ 
 endif
 
-# PKT: support for universal binaries
-# NB: static libraries are poorly supported in Mac OS X. More
-# specifically -static has different semantics than on ELF based
-# systems Also, building mac os x universal binaries is a tad tricky
-# 1. you cannot use ar on a library after calling ranlib 2. -MM
-# dependency tracking does not work
 
-# the architectures to compile for
-UNIVERSAL_ARCH = -arch i386 -arch ppc -arch ppc64
+LDFLAGS = $(LDFLAGS_BASE)
+CFLAGS = $(CFLAGS_BASE) $(CFLAGS_M32)
 
-# the system root (SDK), needed for cross architecture builds
-UNIVERSAL_SDK = /Developer/SDKs/MacOSX10.4u.sdk
-
-
-# use the darmin test as a proxy for detecting Mac OS X
-ifeq ($(shell uname -s), DarwinX)
-  LDFLAGS = -Wl,-syslibroot,$(UNIVERSAL_SDK) $(UNIVERSAL_ARCH) $(LDFLAGS_BASE)
-  CFLAGS = -isysroot $(UNIVERSAL_SDK) $(UNIVERSAL_ARCH) $(CFLAGS_BASE)
-else
-  LDFLAGS = $(LDFLAGS_BASE)
-  CFLAGS = $(CFLAGS_BASE) $(CFLAGS_M32) $(CFLAGS_FPIC)
-endif
 
 # Used by Doug Lea's malloc that I added into minisat2.
 #CFLAGS += -DONLY_MSPACES -DMSPACES