mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(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)

release/0.5
bjarni 2006-03-04 12:09:10 +00:00
parent 87fdb129d2
commit f4cf9b0a91
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -279,11 +279,6 @@ ifndef WINDRES
WINDRES = windres WINDRES = windres
endif 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 # Check if CC_HOST is defined. If not, it is CC
ifndef CC_HOST ifndef CC_HOST
CC_HOST = $(CC) CC_HOST = $(CC)
@ -292,6 +287,10 @@ ifndef CFLAGS_HOST
CFLAGS_HOST = $(BASECFLAGS) CFLAGS_HOST = $(BASECFLAGS)
endif endif
# Check if we have a new target
ifdef CC_TARGET
CC = $(CC_TARGET)
endif
CC_VERSION = $(shell $(CC) -dumpversion | cut -c 1,3) CC_VERSION = $(shell $(CC) -dumpversion | cut -c 1,3)