Mercurial > hg > openttd
changeset 3141:70b2d4ab500c draft
(svn r3759) -Fix: [OSX] don't set CC_HOST to i686 gcc when compiling universal binaries on PPC without any Makefile.config. Introduced in 3674 (before that i686 used PPC as CC_HOST, but nobody noticed that)
| author | bjarni <bjarni@openttd.org> |
|---|---|
| date | Sat, 04 Mar 2006 12:09:10 +0000 |
| parents | 55bb4da591ec |
| children | 8096637a944a |
| files | Makefile |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile +++ b/Makefile @@ -279,11 +279,6 @@ WINDRES = windres endif -# Check if we have a new target -ifdef CC_TARGET -CC = $(CC_TARGET) -endif - # Check if CC_HOST is defined. If not, it is CC ifndef CC_HOST CC_HOST = $(CC) @@ -292,6 +287,10 @@ CFLAGS_HOST = $(BASECFLAGS) endif +# Check if we have a new target +ifdef CC_TARGET +CC = $(CC_TARGET) +endif CC_VERSION = $(shell $(CC) -dumpversion | cut -c 1,3)