From f4cf9b0a91dbf35ebd7ac61aa9a758f00dd1342a Mon Sep 17 00:00:00 2001 From: bjarni Date: Sat, 4 Mar 2006 12:09:10 +0000 Subject: [PATCH] (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) --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 16ebb65087..590a82fa7b 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)