diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-11-06 20:18:17 -0800 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-11-06 21:02:22 -0800 |
| commit | 2073e99f244b73df50d6e158e26d19e638bd24d3 (patch) | |
| tree | 350373bff8fe91c07f0c09b49acf9db15ba4b877 /crawl-ref/source/makefile | |
| parent | 515f957a67b0794aab7e05db9b0b8fbc1e09b318 (diff) | |
| download | crawl-ref-2073e99f244b73df50d6e158e26d19e638bd24d3.tar.gz crawl-ref-2073e99f244b73df50d6e158e26d19e638bd24d3.zip | |
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 <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 8 |
1 files changed, 5 insertions, 3 deletions
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 |