mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-06 14:27:16 +00:00
(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)
This commit is contained in:
parent
87fdb129d2
commit
f4cf9b0a91
9
Makefile
9
Makefile
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user