summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2006-03-04 12:09:10 +0000
committerbjarni <bjarni@openttd.org>2006-03-04 12:09:10 +0000
commitf4cf9b0a91dbf35ebd7ac61aa9a758f00dd1342a (patch)
tree1a0845bf3b2731c1af97adf6c9b1edc9c297a532
parent87fdb129d27b3c0ddde6fb9097c091510074671b (diff)
downloadopenttd-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)
-rw-r--r--Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 16ebb6508..590a82fa7 100644
--- a/Makefile
+++ b/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)