From 2073e99f244b73df50d6e158e26d19e638bd24d3 Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Fri, 6 Nov 2009 20:18:17 -0800 Subject: makefile: change ARCHS variable to use literal archs rather than flags i.e. ARCHS="-arch i386 -arch ppc" is now ARCHS="i386 ppc" Signed-off-by: Steven Noonan --- crawl-ref/source/makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/makefile') diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 9682238161..035265a5de 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -209,9 +209,11 @@ GCC_VER := 4.0 # FIXME: The '-arch i386' is only here until # SDL 1.2.14 is available # -ARCHS := -arch i386 +ARCHS := i386 export ARCHS +CF_ARCHS := $(patsubst %,-arch %,$(ARCHS)) + # Mac OS X 10.4 adds a 'u' on the end of the SDK name. Everything # else is much easier to predict the name of. ifeq ($(SDK_VER),10.4) @@ -220,8 +222,8 @@ else SDKROOT := /Developer/SDKs/MacOSX$(SDK_VER).sdk endif -CC = $(GCC) $(ARCHS) -isysroot $(SDKROOT) -mmacosx-version-min=$(SDK_VER) -CXX = $(GXX) $(ARCHS) -isysroot $(SDKROOT) -mmacosx-version-min=$(SDK_VER) +CC = $(GCC) $(CF_ARCHS) -isysroot $(SDKROOT) -mmacosx-version-min=$(SDK_VER) +CXX = $(GXX) $(CF_ARCHS) -isysroot $(SDKROOT) -mmacosx-version-min=$(SDK_VER) endif # MacOS -- cgit v1.2.3-54-g00ecf