diff options
| author | bjarni <bjarni@openttd.org> | 2006-03-04 12:09:10 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2006-03-04 12:09:10 +0000 |
| commit | f4cf9b0a91dbf35ebd7ac61aa9a758f00dd1342a (patch) | |
| tree | 1a0845bf3b2731c1af97adf6c9b1edc9c297a532 /Makefile | |
| parent | 87fdb129d27b3c0ddde6fb9097c091510074671b (diff) | |
| download | openttd-f4cf9b0a91dbf35ebd7ac61aa9a758f00dd1342a.tar.xz | |
(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)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -279,11 +279,6 @@ ifndef WINDRES 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 @@ ifndef CFLAGS_HOST 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) |