diff options
| author | Neil Moore <neil@s-z.org> | 2013-09-14 00:41:43 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2013-09-14 00:41:43 -0400 |
| commit | dae78c358dd1e41b230709f80d83f40c1d2cfb52 (patch) | |
| tree | 6427afd4250f829b3cbf393885a44910f48402f7 /crawl-ref/source/Makefile | |
| parent | 341fab92c2623802276189ce56f414e8bbce3abb (diff) | |
| download | crawl-ref-dae78c358dd1e41b230709f80d83f40c1d2cfb52.tar.gz crawl-ref-dae78c358dd1e41b230709f80d83f40c1d2cfb52.zip | |
Fix Mac universal builds.
Turn off inline depgen, and furthermore don't build tilegen etc as
universal binaries.
This still doesn't work on ppc, because we hardcode i386 :(
Diffstat (limited to 'crawl-ref/source/Makefile')
| -rw-r--r-- | crawl-ref/source/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index 8a2ce7e317..a14a73eabf 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -440,6 +440,7 @@ ifdef BUILD_UNIVERSAL # [ds] 10.4 SDK g++-4.0 + x86_64 runs into SDL compile issues. CFLAGS_ARCH := -arch i386 -arch ppc -faltivec CFLAGS_DEPCC_ARCH := -arch i386 +NO_INLINE_DEPGEN := YesPlease else CFLAGS_ARCH := -arch $(MARCH) endif @@ -455,8 +456,9 @@ CXX += -gcc-name=gcc-$(GCC_VER) -gxx-name=g++-$(GCC_VER) endif ifndef CROSSHOST -HOSTCC = $(CC) -HOSTCXX = $(CXX) +# Don't need a universal build of host tools, so use DEPCC. +HOSTCC = $(DEPCC) +HOSTCXX = $(DEPCXX) export HOSTCC export HOSTCXX endif |